OSDN Git Service
Leon Scroggins [Wed, 14 Apr 2010 19:10:58 +0000 (12:10 -0700)]
am
876a5dfe: am
b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Merge commit '
876a5dfe3b4a7e0b7bba6b6227a2db2038f29976' into kraken
* commit '
876a5dfe3b4a7e0b7bba6b6227a2db2038f29976':
Ensure the selection does not change in setTextAndKeepSelection.
Kristian Monsen [Wed, 14 Apr 2010 19:10:53 +0000 (12:10 -0700)]
am
a18df134: am
d503a152: Merge "Fix for
2585858, load invalid urls." into froyo
Merge commit '
a18df1341e29ee08c0c406cc9b1e76b7f6921fa7' into kraken
* commit '
a18df1341e29ee08c0c406cc9b1e76b7f6921fa7':
Fix for
2585858, load invalid urls.
Kristian Monsen [Wed, 14 Apr 2010 19:10:47 +0000 (12:10 -0700)]
am
3e360000: am
53c0c0da: Merge "Fix (again) for bug
2558156, update cache encoding correctly" into froyo
Merge commit '
3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken
* commit '
3e360000fcb1cc60d8786d1340f9a468014c6435':
Fix (again) for bug
2558156, update cache encoding correctly
Leon Scroggins [Wed, 14 Apr 2010 19:02:53 +0000 (12:02 -0700)]
am
b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Merge commit '
b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp
* commit '
b2212464a3bc4103a9e5e88602d1097c835d7949':
Ensure the selection does not change in setTextAndKeepSelection.
Kristian Monsen [Wed, 14 Apr 2010 19:02:10 +0000 (12:02 -0700)]
am
d503a152: Merge "Fix for
2585858, load invalid urls." into froyo
Merge commit '
d503a1524acfcaa85c658240ff88f54d174cbb9e' into froyo-plus-aosp
* commit '
d503a1524acfcaa85c658240ff88f54d174cbb9e':
Fix for
2585858, load invalid urls.
Kristian Monsen [Wed, 14 Apr 2010 19:02:01 +0000 (12:02 -0700)]
am
53c0c0da: Merge "Fix (again) for bug
2558156, update cache encoding correctly" into froyo
Merge commit '
53c0c0daf42ca69163fdc1233b3eaca7e382783f' into froyo-plus-aosp
* commit '
53c0c0daf42ca69163fdc1233b3eaca7e382783f':
Fix (again) for bug
2558156, update cache encoding correctly
Jean-Baptiste Queru [Wed, 14 Apr 2010 17:29:49 +0000 (10:29 -0700)]
manual merge
Change-Id: I0a81f92831dabc518cfd33b40ea93fd496a1a01c
Leon Scroggins [Wed, 14 Apr 2010 13:42:20 +0000 (06:42 -0700)]
Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Kristian Monsen [Wed, 14 Apr 2010 09:22:18 +0000 (02:22 -0700)]
Merge "Fix for
2585858, load invalid urls." into froyo
Kristian Monsen [Wed, 14 Apr 2010 09:22:05 +0000 (02:22 -0700)]
Merge "Fix (again) for bug
2558156, update cache encoding correctly" into froyo
Daniel Sandler [Wed, 14 Apr 2010 03:34:23 +0000 (20:34 -0700)]
Merge "Manually integrating froyo lockscreen fixes:" into kraken
Dianne Hackborn [Wed, 14 Apr 2010 01:21:45 +0000 (18:21 -0700)]
am
7b16f95c: am
8e1f2f88: Merge "Fix issue #
2555171: Switching to app immediately after unmounting..." into froyo
Merge commit '
7b16f95cd293cedd2b9204428088ea3e2f8399e5' into kraken
* commit '
7b16f95cd293cedd2b9204428088ea3e2f8399e5':
Fix issue #
2555171: Switching to app immediately after unmounting...
Dianne Hackborn [Wed, 14 Apr 2010 01:10:35 +0000 (18:10 -0700)]
am
8e1f2f88: Merge "Fix issue #
2555171: Switching to app immediately after unmounting..." into froyo
Merge commit '
8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293' into froyo-plus-aosp
* commit '
8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293':
Fix issue #
2555171: Switching to app immediately after unmounting...
Dianne Hackborn [Wed, 14 Apr 2010 01:08:17 +0000 (18:08 -0700)]
am
cd616247: am
ce73c1e5: Framework change for #
2583442: Navigation dies when night mode changes
Merge commit '
cd616247db69bdae8ab781be1f1d646ac7abf755' into kraken
* commit '
cd616247db69bdae8ab781be1f1d646ac7abf755':
Framework change for #
2583442: Navigation dies when night mode changes
Dianne Hackborn [Wed, 14 Apr 2010 01:07:27 +0000 (18:07 -0700)]
Merge "Fix issue #
2555171: Switching to app immediately after unmounting..." into froyo
Dianne Hackborn [Wed, 14 Apr 2010 01:05:47 +0000 (18:05 -0700)]
am
ce73c1e5: Framework change for #
2583442: Navigation dies when night mode changes
Merge commit '
ce73c1e5bfd36154d21ee7b332cfdc6cea48812e' into froyo-plus-aosp
* commit '
ce73c1e5bfd36154d21ee7b332cfdc6cea48812e':
Framework change for #
2583442: Navigation dies when night mode changes
Dianne Hackborn [Wed, 14 Apr 2010 01:02:11 +0000 (18:02 -0700)]
am
fbd22f07: am
ae8c2c71: Merge "Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Merge commit '
fbd22f072b48be4b465085fb5354890e2f10fd32' into kraken
* commit '
fbd22f072b48be4b465085fb5354890e2f10fd32':
Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
Dianne Hackborn [Wed, 14 Apr 2010 00:59:56 +0000 (17:59 -0700)]
am
ae8c2c71: Merge "Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Merge commit '
ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp
* commit '
ae8c2c71f7791ed0321e56f31f0c1276da4d8842':
Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
Dianne Hackborn [Wed, 14 Apr 2010 00:57:23 +0000 (17:57 -0700)]
Merge "Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Grace Kloba [Wed, 14 Apr 2010 00:28:17 +0000 (17:28 -0700)]
am
53a37509: am
ba6339fe: Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can\'t depend on contentToView() to convert the doc point to the view point. When we originall
Merge commit '
53a37509c3a9301423ee6ec47c71bcea47e46d9c' into kraken
* commit '
53a37509c3a9301423ee6ec47c71bcea47e46d9c':
If we defer processing the touch events, pass the
Grace Kloba [Wed, 14 Apr 2010 00:24:04 +0000 (17:24 -0700)]
am
ba6339fe: Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can\'t depend on contentToView() to convert the doc point to the view point. When we originally convert the
Merge commit '
ba6339fe2ba2d7325a99201e82d951064efa31a2' into froyo-plus-aosp
* commit '
ba6339fe2ba2d7325a99201e82d951064efa31a2':
If we defer processing the touch events, pass the
Grace Kloba [Wed, 14 Apr 2010 00:20:29 +0000 (17:20 -0700)]
Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can't depend on contentToView() to convert the doc point to the view point. When we originally convert the view to doc, the scroll position in UI doesn't change. When we convert the doc back to view, we are chasing a moving target. That is why we saw bigger delta." into froyo
Robert Greenwalt [Tue, 13 Apr 2010 23:23:09 +0000 (16:23 -0700)]
am
84748629: am
a466ffe0: am
d3bb93f6: Add build config values for data use defaults
James Dong [Tue, 13 Apr 2010 23:23:05 +0000 (16:23 -0700)]
am
c33f583b: am
4f3257cf: am
dd684af8: Merge "Snif more 3GPP file types according to ftyps.com/3gpp.html" into froyo
Suchi Amalapurapu [Tue, 13 Apr 2010 23:23:01 +0000 (16:23 -0700)]
am
2ae08f70: am
a55987df: am
812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We sen
Robert Greenwalt [Tue, 13 Apr 2010 23:22:51 +0000 (16:22 -0700)]
am
7024396f: am
7125a0dc: am
42843c3c: Merge "Fix Throttle Notification intents" into froyo
Christopher Tate [Tue, 13 Apr 2010 23:22:16 +0000 (16:22 -0700)]
am
0162c3c7: am
3643dc8c: am
3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Robert Greenwalt [Tue, 13 Apr 2010 23:09:19 +0000 (16:09 -0700)]
am
a466ffe0: am
d3bb93f6: Add build config values for data use defaults
Merge commit '
a466ffe042ca0a7ef14d3942114f3ea916db225e' into kraken
* commit '
a466ffe042ca0a7ef14d3942114f3ea916db225e':
Add build config values for data use defaults
Robert Greenwalt [Tue, 13 Apr 2010 23:07:19 +0000 (16:07 -0700)]
am
d3bb93f6: Add build config values for data use defaults
Merge commit '
d3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16' into froyo-plus-aosp
* commit '
d3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16':
Add build config values for data use defaults
Andreas Huber [Tue, 13 Apr 2010 23:05:49 +0000 (16:05 -0700)]
am
d760afc3: am
30e9c2d4: am
db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition
James Dong [Tue, 13 Apr 2010 23:05:42 +0000 (16:05 -0700)]
am
ebaa935e: am
9bb8e65a: am
c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Grace Kloba [Tue, 13 Apr 2010 23:05:34 +0000 (16:05 -0700)]
am
346c97c4: am
58af51a1: am
763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Amith Yamasani [Tue, 13 Apr 2010 23:05:27 +0000 (16:05 -0700)]
am
61f280d5: am
feb976e6: am
842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Jean-Michel Trivi [Tue, 13 Apr 2010 23:05:21 +0000 (16:05 -0700)]
am
b8430335: am
34b2ecc8: am
c30890e1: Merge "Fix bug
2578813 Delay pausing music and routing audio for car docks" into froyo
Gloria Wang [Tue, 13 Apr 2010 23:05:13 +0000 (16:05 -0700)]
am
465934d1: am
d4c072d3: am
b19da8e1: Fix for
2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
Daniel Sandler [Tue, 13 Apr 2010 23:05:07 +0000 (16:05 -0700)]
am
a32efedd: am
de3601e0: am
bcac4960: Honor the "Never vibrate" setting for incoming calls.
James Dong [Tue, 13 Apr 2010 22:42:01 +0000 (15:42 -0700)]
am
4f3257cf: am
dd684af8: Merge "Snif more 3GPP file types according to ftyps.com/3gpp.html" into froyo
Merge commit '
4f3257cf4667aa28908c401634db849fd2e516af' into kraken
* commit '
4f3257cf4667aa28908c401634db849fd2e516af':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
James Dong [Tue, 13 Apr 2010 22:37:50 +0000 (15:37 -0700)]
am
dd684af8: Merge "Snif more 3GPP file types according to ftyps.com/3gpp.html" into froyo
Merge commit '
dd684af8c8fd5984d4d40b125bfac1ce268622ae' into froyo-plus-aosp
* commit '
dd684af8c8fd5984d4d40b125bfac1ce268622ae':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
Suchi Amalapurapu [Tue, 13 Apr 2010 22:36:10 +0000 (15:36 -0700)]
am
a55987df: am
812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We send a broadcast
Merge commit '
a55987df919240b045de977217bd55723c37dfcb' into kraken
* commit '
a55987df919240b045de977217bd55723c37dfcb':
Fix crashes related to unmounting when app on sdcard has an active notification
James Dong [Tue, 13 Apr 2010 22:34:20 +0000 (15:34 -0700)]
Merge "Snif more 3GPP file types according to ftyps.com/3gpp.html" into froyo
Suchi Amalapurapu [Tue, 13 Apr 2010 22:32:59 +0000 (15:32 -0700)]
am
812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We send a broadcast about disabl
Merge commit '
812b24fd9d254f37e34f2878f599253a1f3bffe9' into froyo-plus-aosp
* commit '
812b24fd9d254f37e34f2878f599253a1f3bffe9':
Fix crashes related to unmounting when app on sdcard has an active notification
Suchi Amalapurapu [Tue, 13 Apr 2010 22:30:07 +0000 (15:30 -0700)]
Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We send a broadcast about disabled packages. Force a gc to clean up any stale asset references and then unmount the containers before invoking the MountService call back." into froyo
Robert Greenwalt [Tue, 13 Apr 2010 22:29:19 +0000 (15:29 -0700)]
am
7125a0dc: am
42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '
7125a0dca844b066a3f6ebdacaea4ade9e651c8d' into kraken
* commit '
7125a0dca844b066a3f6ebdacaea4ade9e651c8d':
Fix Throttle Notification intents
Robert Greenwalt [Tue, 13 Apr 2010 22:25:05 +0000 (15:25 -0700)]
am
42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '
42843c3ceb8b17e860112f8f2718cda40de15839' into froyo-plus-aosp
* commit '
42843c3ceb8b17e860112f8f2718cda40de15839':
Fix Throttle Notification intents
Robert Greenwalt [Tue, 13 Apr 2010 22:22:00 +0000 (15:22 -0700)]
Merge "Fix Throttle Notification intents" into froyo
Christopher Tate [Tue, 13 Apr 2010 21:29:28 +0000 (14:29 -0700)]
am
3643dc8c: am
3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Merge commit '
3643dc8c73bbf53c7aa6bb73d09d83c7578639e0' into kraken
* commit '
3643dc8c73bbf53c7aa6bb73d09d83c7578639e0':
SDK: last of the backup/restore docs content
Christopher Tate [Tue, 13 Apr 2010 21:24:54 +0000 (14:24 -0700)]
am
3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Merge commit '
3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778' into froyo-plus-aosp
* commit '
3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778':
SDK: last of the backup/restore docs content
Christopher Tate [Tue, 13 Apr 2010 21:21:48 +0000 (14:21 -0700)]
Merge "SDK: last of the backup/restore docs content" into froyo
Andreas Huber [Tue, 13 Apr 2010 19:23:28 +0000 (12:23 -0700)]
am
30e9c2d4: am
db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." in
Merge commit '
30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken
* commit '
30e9c2d4db145e02b5312ce29606b03dd78349d3':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
James Dong [Tue, 13 Apr 2010 19:20:38 +0000 (12:20 -0700)]
am
9bb8e65a: am
c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Merge commit '
9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken
* commit '
9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
Don't set encoder component role while we query decoders
Grace Kloba [Tue, 13 Apr 2010 19:20:35 +0000 (12:20 -0700)]
am
58af51a1: am
763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit '
58af51a1f2afc20ac1f1465b13c300754358be6c' into kraken
* commit '
58af51a1f2afc20ac1f1465b13c300754358be6c':
Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Andreas Huber [Tue, 13 Apr 2010 19:20:09 +0000 (12:20 -0700)]
am
db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." into froyo
Merge commit '
db281311a0e957ba989509cf11f2085b4db12074' into froyo-plus-aosp
* commit '
db281311a0e957ba989509cf11f2085b4db12074':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
Andreas Huber [Tue, 13 Apr 2010 19:16:08 +0000 (12:16 -0700)]
Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." into froyo
James Dong [Tue, 13 Apr 2010 19:15:26 +0000 (12:15 -0700)]
am
c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Merge commit '
c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp
* commit '
c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
Don't set encoder component role while we query decoders
Grace Kloba [Tue, 13 Apr 2010 19:14:32 +0000 (12:14 -0700)]
am
763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit '
763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp
* commit '
763e62a831f6cf4e113bff868dab4d48560a3693':
Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
James Dong [Tue, 13 Apr 2010 19:11:57 +0000 (12:11 -0700)]
Merge "Don't set encoder component role while we query decoders" into froyo
Amith Yamasani [Tue, 13 Apr 2010 18:54:04 +0000 (11:54 -0700)]
am
feb976e6: am
842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Merge commit '
feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken
* commit '
feb976e6be3a07dd31b35b35287420bba9ffbbf3':
Fix an upgrade bug in SettingsProvider.
Jean-Michel Trivi [Tue, 13 Apr 2010 18:53:57 +0000 (11:53 -0700)]
am
34b2ecc8: am
c30890e1: Merge "Fix bug
2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit '
34b2ecc82aae3d317c2f4985049f68df3f8adbd7' into kraken
* commit '
34b2ecc82aae3d317c2f4985049f68df3f8adbd7':
Fix bug
2578813 Delay pausing music and routing audio for car docks
Gloria Wang [Tue, 13 Apr 2010 18:53:52 +0000 (11:53 -0700)]
am
d4c072d3: am
b19da8e1: Fix for
2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
Merge commit '
d4c072d3f584db2cf9214c9d813c15d9e646c527' into kraken
* commit '
d4c072d3f584db2cf9214c9d813c15d9e646c527':
Fix for
2581725. Keep the last frame after resume(), and delete it
Daniel Sandler [Tue, 13 Apr 2010 18:53:30 +0000 (11:53 -0700)]
am
de3601e0: am
bcac4960: Honor the "Never vibrate" setting for incoming calls.
Merge commit '
de3601e05cf551e24eee50d4c1e70b5037792679' into kraken
* commit '
de3601e05cf551e24eee50d4c1e70b5037792679':
Honor the "Never vibrate" setting for incoming calls.
Daniel Sandler [Tue, 13 Apr 2010 17:33:11 +0000 (10:33 -0700)]
am
8dc634e8: am
b0cc22b4: am
15683534: Merge "Hide e-call button in layout." into froyo
Mathias Agopian [Tue, 13 Apr 2010 17:33:07 +0000 (10:33 -0700)]
am
445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken
Amith Yamasani [Tue, 13 Apr 2010 17:08:10 +0000 (10:08 -0700)]
am
842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Merge commit '
842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp
* commit '
842d983cc3158a3de77a897d071b5b9c18dd2b55':
Fix an upgrade bug in SettingsProvider.
Amith Yamasani [Tue, 13 Apr 2010 17:05:27 +0000 (10:05 -0700)]
Merge "Fix an upgrade bug in SettingsProvider." into froyo
Jean-Michel Trivi [Tue, 13 Apr 2010 16:54:47 +0000 (09:54 -0700)]
am
c30890e1: Merge "Fix bug
2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit '
c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp
* commit '
c30890e102cbae24e4c821ba4274f6ac8b18f1db':
Fix bug
2578813 Delay pausing music and routing audio for car docks
Gloria Wang [Tue, 13 Apr 2010 16:54:44 +0000 (09:54 -0700)]
am
b19da8e1: Fix for
2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
Merge commit '
b19da8e187db1cf223463809148b7cb2d9e9751a' into froyo-plus-aosp
* commit '
b19da8e187db1cf223463809148b7cb2d9e9751a':
Fix for
2581725. Keep the last frame after resume(), and delete it
Jean-Michel Trivi [Tue, 13 Apr 2010 16:53:35 +0000 (09:53 -0700)]
Merge "Fix bug
2578813 Delay pausing music and routing audio for car docks" into froyo
Daniel Sandler [Tue, 13 Apr 2010 16:21:47 +0000 (09:21 -0700)]
am
bcac4960: Honor the "Never vibrate" setting for incoming calls.
Merge commit '
bcac496076ef6f439147e7a2be71e8a2b76ddede' into froyo-plus-aosp
* commit '
bcac496076ef6f439147e7a2be71e8a2b76ddede':
Honor the "Never vibrate" setting for incoming calls.
Daniel Sandler [Tue, 13 Apr 2010 13:10:10 +0000 (06:10 -0700)]
am
b0cc22b4: am
15683534: Merge "Hide e-call button in layout." into froyo
Merge commit '
b0cc22b4059ea49623defa1c118db9abdd59a0be' into kraken
* commit '
b0cc22b4059ea49623defa1c118db9abdd59a0be':
Hide e-call button in layout.
Daniel Sandler [Tue, 13 Apr 2010 13:05:20 +0000 (06:05 -0700)]
am
15683534: Merge "Hide e-call button in layout." into froyo
Merge commit '
15683534d1f1ca76a9a59ed921219db46ff5f800' into froyo-plus-aosp
* commit '
15683534d1f1ca76a9a59ed921219db46ff5f800':
Hide e-call button in layout.
Daniel Sandler [Tue, 13 Apr 2010 13:00:02 +0000 (06:00 -0700)]
Merge "Hide e-call button in layout." into froyo
Mathias Agopian [Tue, 13 Apr 2010 01:59:49 +0000 (18:59 -0700)]
Merge "don't hardcode "mSurface" throughout our source code" into kraken
Andreas Huber [Tue, 13 Apr 2010 00:25:48 +0000 (17:25 -0700)]
am
7853c898: am
248ea4a9: am
5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Andreas Huber [Tue, 13 Apr 2010 00:21:33 +0000 (17:21 -0700)]
am
248ea4a9: am
5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Merge commit '
248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken
* commit '
248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Andreas Huber [Tue, 13 Apr 2010 00:18:43 +0000 (17:18 -0700)]
am
5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Merge commit '
5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp
* commit '
5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Andreas Huber [Tue, 13 Apr 2010 00:15:32 +0000 (17:15 -0700)]
Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
android-build SharedAccount [Mon, 12 Apr 2010 23:56:30 +0000 (16:56 -0700)]
manual merge
Change-Id: I4760b8fd2f4150441dbf15a598a6b44d9af27621
Mathias Agopian [Mon, 12 Apr 2010 23:22:15 +0000 (16:22 -0700)]
don't hardcode "mSurface" throughout our source code
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.
Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
Christopher Tate [Mon, 12 Apr 2010 23:23:35 +0000 (16:23 -0700)]
am
6a75d685: am
7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo
Merge commit '
6a75d6850c77fb48daba7700621856605ab60569' into kraken
* commit '
6a75d6850c77fb48daba7700621856605ab60569':
SDK: more backup/restore documentation work
Christopher Tate [Mon, 12 Apr 2010 23:18:16 +0000 (16:18 -0700)]
am
7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo
Merge commit '
7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp
* commit '
7e8614a547eca78dd9178001f8f6c38444adf350':
SDK: more backup/restore documentation work
Scott Main [Mon, 12 Apr 2010 23:15:42 +0000 (16:15 -0700)]
Christopher Tate [Mon, 12 Apr 2010 23:14:53 +0000 (16:14 -0700)]
Merge "SDK: more backup/restore documentation work" into froyo
Scott Main [Mon, 12 Apr 2010 23:12:24 +0000 (16:12 -0700)]
am
3f371793: Merge "docs: fix bug
2590728" into froyo
Merge commit '
3f371793287b6f10badc018fb9eaca33ac51a8e7' into froyo-plus-aosp
* commit '
3f371793287b6f10badc018fb9eaca33ac51a8e7':
docs: fix bug
2590728
Scott Main [Mon, 12 Apr 2010 23:09:28 +0000 (16:09 -0700)]
Merge "docs: fix bug
2590728" into froyo
Jean-Baptiste Queru [Mon, 12 Apr 2010 22:32:13 +0000 (15:32 -0700)]
manual merge
Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774
Christopher Tate [Mon, 12 Apr 2010 22:19:16 +0000 (15:19 -0700)]
am
7fef3c57: am
b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit '
7fef3c57eb6f5fbef65dd553ea49d93111d595da' into kraken
* commit '
7fef3c57eb6f5fbef65dd553ea49d93111d595da':
API CHANGE: remove obsolete constants and hide some methods
Christopher Tate [Mon, 12 Apr 2010 22:16:07 +0000 (15:16 -0700)]
am
b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit '
b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp
* commit '
b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
API CHANGE: remove obsolete constants and hide some methods
Christopher Tate [Mon, 12 Apr 2010 22:13:35 +0000 (15:13 -0700)]
Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
android-build SharedAccount [Mon, 12 Apr 2010 21:47:38 +0000 (14:47 -0700)]
android-build SharedAccount [Mon, 12 Apr 2010 21:46:11 +0000 (14:46 -0700)]
Andreas Huber [Mon, 12 Apr 2010 21:23:31 +0000 (14:23 -0700)]
am
98c5bd55: am
6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo
Merge commit '
98c5bd5556f32a237d3483fb7298284869e32a40' into kraken
* commit '
98c5bd5556f32a237d3483fb7298284869e32a40':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Andreas Huber [Mon, 12 Apr 2010 21:19:23 +0000 (14:19 -0700)]
am
6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo
Merge commit '
6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp
* commit '
6dbf80d086d03d95c5f6331719edd6dd6dac0361':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Andreas Huber [Mon, 12 Apr 2010 21:16:34 +0000 (14:16 -0700)]
Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo
Kenny Root [Mon, 12 Apr 2010 19:24:51 +0000 (12:24 -0700)]
am
5b0fb521: am
290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo
Merge commit '
5b0fb521e6af1ca61141daa3d86f97fd6343f5e4' into kraken
* commit '
5b0fb521e6af1ca61141daa3d86f97fd6343f5e4':
Fix typos in name of density-independent pixels
Kenny Root [Mon, 12 Apr 2010 19:20:50 +0000 (12:20 -0700)]
am
290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo
Merge commit '
290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp
* commit '
290a48b365479eccd16023b5de0d92063bb68b4d':
Fix typos in name of density-independent pixels
Kenny Root [Mon, 12 Apr 2010 19:19:08 +0000 (12:19 -0700)]
Merge "Fix typos in name of density-independent pixels" into froyo
Jean-Michel Trivi [Mon, 12 Apr 2010 19:11:54 +0000 (12:11 -0700)]
am
54419a4f: am
12221b6f: Merge "Fix monkey bug
2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack.
Merge commit '
54419a4fc908eab8408f39f3eae97c4315135d84' into kraken
* commit '
54419a4fc908eab8408f39f3eae97c4315135d84':
Fix monkey bug
2586534 java.util.ConcurrentModificationException
Jean-Michel Trivi [Mon, 12 Apr 2010 19:07:44 +0000 (12:07 -0700)]
am
12221b6f: Merge "Fix monkey bug
2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corr
Merge commit '
12221b6f7c86349e3dcf89f814355e41f9e58cbf' into froyo-plus-aosp
* commit '
12221b6f7c86349e3dcf89f814355e41f9e58cbf':
Fix monkey bug
2586534 java.util.ConcurrentModificationException
Jean-Michel Trivi [Mon, 12 Apr 2010 19:05:08 +0000 (12:05 -0700)]
Merge "Fix monkey bug
2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo
Patrick Scott [Mon, 12 Apr 2010 18:55:53 +0000 (11:55 -0700)]
am
c9eaa3cb: am
36acfbc2: Add a bulk request method for bookmark icons.
Merge commit '
c9eaa3cbb0d6152cd156a9e66ef23389042b48b5' into kraken
* commit '
c9eaa3cbb0d6152cd156a9e66ef23389042b48b5':
Add a bulk request method for bookmark icons.