Dianne Hackborn
3bf653e82a
am 037cd341: Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
...
Merge commit '037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp
* commit '037cd3413a925c6f449050096a7cd4aab3207612':
Fix issue #2676378 : Activity Manager Crash on FRF40
2010-05-12 07:50:09 -07:00
Scott Main
7ea9c96ed0
am 5cdf5fdc: docs: add document about app install location
...
Merge commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d' into froyo-plus-aosp
* commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d':
docs: add document about app install location
2010-05-12 07:50:02 -07:00
Dirk Dougherty
0208978f3e
am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
...
Merge commit '8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp
* commit '8acb68e9aae7f6766b88440ede6598da63db9fdd':
Doc Change: Docs for NDK r4.
2010-05-12 07:49:57 -07:00
Scott Main
ee8cf6652a
am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
...
Merge commit 'c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp
* commit 'c80b95a85ae31eba80870cb3416fd2c25821c056':
docs: announce froyo and update IO message
2010-05-12 07:49:51 -07:00
Mike Lockwood
0904bbd87a
am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
...
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp
* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
LocationManagerService: Call updateNetworkState on providers that are disabled.
2010-05-12 07:49:45 -07:00
Andreas Huber
3469d55e9a
am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
...
Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp
* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
Support for customizable socket-read timeouts through the HTTP response.
2010-05-12 07:49:39 -07:00
Andreas Huber
71661ed17f
am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
...
Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp
* commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
2010-05-12 07:49:31 -07:00
Costin Manolache
884e624b3a
am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
...
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp
* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
Bug 2673557: rename datamessaging
2010-05-12 07:49:16 -07:00
Jean-Michel Trivi
e2eceb0ef4
am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
...
Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp
* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
Update javadoc in android.media.AudioManager to not hide the
2010-05-12 07:49:10 -07:00
Dirk Dougherty
e0aa23a970
am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
...
Merge commit 'fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp
* commit 'fe08933450f4be42c9b3eac900c64f23857ecd17':
Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
2010-05-12 07:49:00 -07:00
Jean-Michel Trivi
98dd1ec92c
am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen
...
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp
* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
Fix bug 2670395 and 2599698
2010-05-12 07:48:50 -07:00
Wu-cheng Li
d76bfb35de
am 78624e41: Add remove method in CameraParameters class.
...
Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp
* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
Add remove method in CameraParameters class.
2010-05-12 07:48:41 -07:00
Eric Laurent
d878cd8a79
Fix issue 2678048: binder death detection in AudioFlinger is broken.
...
There is a bug in the way notification client list is managed when the client binder
interface dies that makes that the dead client is not removed from the list: the week
reference passed by binderDied() cannot be promoted and compared to the strong
references in the list.
The fix consists in creating a new NotificationClient class that implements the
binder DeathRecipient and holds a strong reference to the IAudioFlingerClient interface.
A new instance of this class is created for each cient and a strong reference to this
object is added to the notification client list maintained by AudioFlinger.
When binderDied() is called on this object, it is removed from the list preventing
AudioFlinger to notify this client for further io changes.
Also added code to disable LifeVibes effects when the client that has enabled the
enhancements dies.
Change-Id: Icedc4af171759e9ae9a575d82d44784b4e8267e8
2010-05-12 06:29:16 -07:00
Kenny Root
d4066a4ac5
ZipUtilsRO rewrite based on Dalvik Zip rewrite
...
Change the way zip archives are handled. This is necessary to deal with
very large (~1GB) APK files, for which our current approach of mapping
the entire file falls over.
We now do the classic scavenger hunt for the End Of Central Directory
magic on a buffer of data read from the file, instead of a memory-mapped
section. We use what we find to create a map that covers the Central
Directory only.
If the caller is interested in unpacking the file contents, we have to
do an additional file read to discover the size of the Local File Header
section so we can skip past it.
This is based on Change I745fb15abb in the dalvik tree. Both
implementations share a common ancestry, but the cost of unifying them
outweighs the benefits of wrapping C calls.
Change-Id: Iddacb50fe913917c2845708a530872d65fdbe620
2010-05-12 05:07:48 -07:00
Scott Main
5f50306d26
Merge "docs: fix broken anchor names" into froyo
2010-05-11 20:13:26 -07:00
Dirk Dougherty
c42a5b0d6e
Merge "Doc change: update diff report 7-> 8" into froyo
2010-05-11 19:53:04 -07:00
Scott Main
2a2c699ffa
Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
2010-05-11 19:25:19 -07:00
Brett Chabot
b7c34d1610
Merge "Fix imf tests." into froyo
2010-05-11 19:17:04 -07:00
Scott Main
6ff074cb78
Merge "docs: remove allowBackup attribute from documentation" into froyo
2010-05-11 15:25:38 -07:00
Xavier Ducrohet
4ef3c6a791
Merge "Hide two audio focus methods." into froyo
2010-05-11 14:48:48 -07:00
Marco Nelissen
ac1feedad2
Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
2010-05-11 14:36:16 -07:00
Dianne Hackborn
cd4d3b6287
Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
2010-05-11 14:26:43 -07:00
Dirk Dougherty
0feef91d2b
Merge "Doc Change: Docs for NDK r4." into froyo
2010-05-11 14:20:24 -07:00
Scott Main
2577b83dfe
Merge "docs: announce froyo and update IO message" into froyo
2010-05-11 14:04:49 -07:00
James Dong
b5b9a4caeb
am 2cd841d4: Added initial validation on video/audio encoding parameters before/at start()
2010-05-11 13:37:11 -07:00
Jamie Gennis
16c54dc00f
am 25c2af99: Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken
2010-05-11 13:37:04 -07:00
James Dong
1924a01aa5
am b5e74239: Output streamable MP4 file during MP4 file recording
2010-05-11 13:36:54 -07:00
Mike Lockwood
c9797fed88
Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
2010-05-11 13:26:25 -07:00
Jamie Gennis
1853b7d790
Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken
2010-05-11 12:25:31 -07:00
Andreas Huber
c5417a7da5
Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
2010-05-11 12:21:14 -07:00
Andreas Huber
1722e37f40
Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
2010-05-11 12:20:55 -07:00
Dianne Hackborn
0534ab8ce9
Merge "Corrected repeat count for key repeat in input device."
2010-05-11 12:07:32 -07:00
Costin Manolache
8e254d83ec
Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-11 11:42:58 -07:00
Jean-Michel Trivi
edd2838a25
Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
2010-05-11 11:40:21 -07:00
Dirk Dougherty
6f29001ba5
Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
2010-05-11 11:33:13 -07:00
Keith Ito
1ef6a8b456
am 8528fcb1: am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-11 10:26:24 -07:00
Nicolas Roard
ca07c17053
am 2f68be54: am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
2010-05-11 10:26:20 -07:00
Dianne Hackborn
a3d73a97b7
am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:26:15 -07:00
Dirk Dougherty
1b37884e7c
am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-11 10:26:11 -07:00
Dirk Dougherty
8df7c60ee6
am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:26:06 -07:00
Jim Miller
1dec60f893
am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-11 10:26:00 -07:00
Keith Ito
0ec06bc48e
am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken
* commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:24:03 -07:00
Nicolas Roard
3a1fae098e
am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken
* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:24:00 -07:00
Dianne Hackborn
bd516f83b3
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Dirk Dougherty
7f0364ebfc
am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
...
Merge commit '02168c41c444e4f601a2809d6d948e4b051b3a3e' into kraken
* commit '02168c41c444e4f601a2809d6d948e4b051b3a3e':
Doc change: Final api diffs 7 -> 8.
2010-05-11 10:23:52 -07:00
Dirk Dougherty
73b63df812
am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
...
Merge commit '769612e160c9be01c96371412e12d367e5063e9f' into kraken
* commit '769612e160c9be01c96371412e12d367e5063e9f':
Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:23:48 -07:00
Jim Miller
522fb399ab
am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
...
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken
* commit '4d89954dc4572a05339dc7a95ec683892558162b':
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:23:42 -07:00
Keith Ito
cf8fd0834e
am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp
* commit 'be65399baf23855094596e27c25763ff92e9e027':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:19:06 -07:00
Nicolas Roard
bdb8e89e84
am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp
* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:18:59 -07:00
Dianne Hackborn
ead2a8ad7d
am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp
* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:18:55 -07:00