OSDN Git Service
Grace Kloba [Tue, 6 Apr 2010 19:38:47 +0000 (12:38 -0700)]
am
54fccf8a: Merge "Update the Webkit version." into froyo
Merge commit '
54fccf8a074f1b743df5b270c4f85e0e602d7f46' into froyo-plus-aosp
* commit '
54fccf8a074f1b743df5b270c4f85e0e602d7f46':
Update the Webkit version.
Romain Guy [Tue, 6 Apr 2010 19:38:33 +0000 (12:38 -0700)]
am
bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #
2549649" into froyo
Merge commit '
bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp
* commit '
bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
Correctly resize dialogs when measured in WRAP_CONTENT
Dianne Hackborn [Tue, 6 Apr 2010 19:38:22 +0000 (12:38 -0700)]
am
48bce451: Merge "Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Merge commit '
48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp
* commit '
48bce4515d948971a122a1e17fd1919f81297d77':
Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
Grace Kloba [Tue, 6 Apr 2010 18:50:32 +0000 (11:50 -0700)]
Merge "Update the Webkit version." into froyo
Romain Guy [Tue, 6 Apr 2010 18:25:43 +0000 (11:25 -0700)]
Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #
2549649" into froyo
Dianne Hackborn [Tue, 6 Apr 2010 18:18:01 +0000 (11:18 -0700)]
Merge "Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Suchi Amalapurapu [Tue, 6 Apr 2010 17:55:43 +0000 (10:55 -0700)]
am
fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo
Merge commit '
fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp
* commit '
fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
Forcibly unmount the sdcard after N retries.
Suchi Amalapurapu [Tue, 6 Apr 2010 17:50:56 +0000 (10:50 -0700)]
Merge "Forcibly unmount the sdcard after N retries." into froyo
Irfan Sheriff [Tue, 6 Apr 2010 17:48:46 +0000 (10:48 -0700)]
am
b2e6c01f: Disable tethering when airplane mode is enabled
Merge commit '
b2e6c01f449f3fd4effee7029518684deb4e98f6' into froyo-plus-aosp
* commit '
b2e6c01f449f3fd4effee7029518684deb4e98f6':
Disable tethering when airplane mode is enabled
Bjorn Bringert [Tue, 6 Apr 2010 15:57:01 +0000 (08:57 -0700)]
am
7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '
7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp
* commit '
7d2511b722808dfc9cadd3f0f49375fcb738df56':
Guard against NPE in SearchManagerService
Bjorn Bringert [Tue, 6 Apr 2010 15:53:12 +0000 (08:53 -0700)]
Merge "Guard against NPE in SearchManagerService" into froyo
Joe Onorato [Tue, 6 Apr 2010 15:36:05 +0000 (08:36 -0700)]
am
fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo
Merge commit '
fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp
* commit '
fa588fc37420a1a4d287e6307700ca310897308a':
Redo the look of the recent apps switcher
Joe Onorato [Tue, 6 Apr 2010 15:32:07 +0000 (08:32 -0700)]
Merge "Redo the look of the recent apps switcher" into froyo
Dianne Hackborn [Tue, 6 Apr 2010 01:45:50 +0000 (18:45 -0700)]
am
6e52b5d7:
2568467 System crash when installing corrupt APK
Merge commit '
6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp
* commit '
6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
2568467 System crash when installing corrupt APK
Dianne Hackborn [Tue, 6 Apr 2010 01:39:04 +0000 (18:39 -0700)]
am
01f6b75b: Merge "Fix issue #
2564479: Favorite Recipes App Installation Fail" into froyo
Merge commit '
01f6b75baa3b9144240fa8c9772859ab4ac948bd' into froyo-plus-aosp
* commit '
01f6b75baa3b9144240fa8c9772859ab4ac948bd':
Fix issue #
2564479: Favorite Recipes App Installation Fail
Dianne Hackborn [Tue, 6 Apr 2010 01:35:11 +0000 (18:35 -0700)]
Merge "Fix issue #
2564479: Favorite Recipes App Installation Fail" into froyo
Jim Miller [Tue, 6 Apr 2010 00:21:20 +0000 (17:21 -0700)]
am
a6cce790: Merge "Fix
2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit '
a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp
* commit '
a6cce790b24debae49f1df9f039e83e3e29e5cd1':
Fix
2325549: Allow up to 4 lines of summary text in Settings
Jim Miller [Tue, 6 Apr 2010 00:16:00 +0000 (17:16 -0700)]
Merge "Fix
2325549: Allow up to 4 lines of summary text in Settings" into froyo
Dirk Dougherty [Mon, 5 Apr 2010 23:44:58 +0000 (16:44 -0700)]
am
bcbb7b27: Merge "docs: add manifest documentation for installLocation" into froyo
Merge commit '
bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1' into froyo-plus-aosp
* commit '
bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1':
docs: add manifest documentation for installLocation
Dirk Dougherty [Mon, 5 Apr 2010 23:37:07 +0000 (16:37 -0700)]
Merge "docs: add manifest documentation for installLocation" into froyo
Wei Huang [Mon, 5 Apr 2010 22:42:30 +0000 (15:42 -0700)]
am
0abdf03d: Merge "bug
2542580: fix bad icon." into froyo
Merge commit '
0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f' into froyo-plus-aosp
* commit '
0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f':
bug
2542580: fix bad icon.
Wei Huang [Mon, 5 Apr 2010 22:36:40 +0000 (15:36 -0700)]
Merge "bug
2542580: fix bad icon." into froyo
Doug Zongker [Mon, 5 Apr 2010 22:19:49 +0000 (15:19 -0700)]
am
4c59ca8b: Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Merge commit '
4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0' into froyo-plus-aosp
* commit '
4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0':
remove OTA packages from the old (pre-froyo) updater
Doug Zongker [Mon, 5 Apr 2010 22:16:12 +0000 (15:16 -0700)]
Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Dan Morrill [Mon, 5 Apr 2010 21:59:47 +0000 (14:59 -0700)]
am
21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Merge commit '
21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp
* commit '
21390f08138801f9e008917c0c0149839a80d002':
Adding a feature definition for touchscreens that was overlooked in the last
Kenny Root [Mon, 5 Apr 2010 21:59:44 +0000 (14:59 -0700)]
am
0db37997: Merge "Revert to previous text selection behavior" into froyo
Merge commit '
0db37997366a4d781af48be758a9d90b6d07d7d5' into froyo-plus-aosp
* commit '
0db37997366a4d781af48be758a9d90b6d07d7d5':
Revert to previous text selection behavior
Dan Morrill [Mon, 5 Apr 2010 21:56:03 +0000 (14:56 -0700)]
Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Kenny Root [Mon, 5 Apr 2010 21:55:10 +0000 (14:55 -0700)]
Merge "Revert to previous text selection behavior" into froyo
Jaikumar Ganesh [Mon, 5 Apr 2010 21:50:46 +0000 (14:50 -0700)]
am
c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo
Merge commit '
c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp
* commit '
c6af69b2684e1a95368f52e1f1614595f85c9c12':
Add an extra for the Disconnect Headset State.
Jaikumar Ganesh [Mon, 5 Apr 2010 21:45:27 +0000 (14:45 -0700)]
Merge "Add an extra for the Disconnect Headset State." into froyo
Wei Huang [Mon, 5 Apr 2010 21:40:23 +0000 (14:40 -0700)]
am
badaa778: Merge "bug #
2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Merge commit '
badaa7782d76115154a63d47d02caec15832fcb9' into froyo-plus-aosp
* commit '
badaa7782d76115154a63d47d02caec15832fcb9':
bug #
2542580: fix stat_notify_chat icon for mdpi resource.
Wei Huang [Mon, 5 Apr 2010 21:36:47 +0000 (14:36 -0700)]
Merge "bug #
2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Amith Yamasani [Mon, 5 Apr 2010 21:20:57 +0000 (14:20 -0700)]
am
1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '
1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp
* commit '
1b4c0d702066794b9ce97b02721aa9e552997381':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Amith Yamasani [Mon, 5 Apr 2010 21:17:55 +0000 (14:17 -0700)]
Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Ray Chen [Mon, 5 Apr 2010 20:16:19 +0000 (13:16 -0700)]
am
44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '
44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp
* commit '
44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
Make createVideoThumbnail and createImageThumbnail look consistent.
Cary Clark [Mon, 5 Apr 2010 19:30:12 +0000 (12:30 -0700)]
am
3eefc126: check for webviewcore before reading settings
Merge commit '
3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp
* commit '
3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
check for webviewcore before reading settings
Leon Scroggins [Mon, 5 Apr 2010 18:38:05 +0000 (11:38 -0700)]
am
f9b1a092: Only include WEB_EDIT if there are more textfields.
Merge commit '
f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp
* commit '
f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
Only include WEB_EDIT if there are more textfields.
San Mehat [Mon, 5 Apr 2010 17:41:19 +0000 (10:41 -0700)]
am
73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
Merge commit '
73a8f26aef40184d9d5dfe9dabcfbd345deb6386' into froyo-plus-aosp
* commit '
73a8f26aef40184d9d5dfe9dabcfbd345deb6386':
NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
San Mehat [Mon, 5 Apr 2010 17:35:56 +0000 (10:35 -0700)]
Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
Christopher Tate [Mon, 5 Apr 2010 00:56:35 +0000 (17:56 -0700)]
am
5923c971: Fix \'dumpsys backup\'
Merge commit '
5923c9718390bf6d50c52661263f15c1f863012b' into froyo-plus-aosp
* commit '
5923c9718390bf6d50c52661263f15c1f863012b':
Fix 'dumpsys backup'
Christopher Tate [Sat, 3 Apr 2010 02:18:09 +0000 (19:18 -0700)]
am
1484b6d6: Merge "Fix "incall in landscape sometimes" bug #
2523942" into froyo
Merge commit '
1484b6d6b75e13dd96b0f47158926d7989808272' into froyo-plus-aosp
* commit '
1484b6d6b75e13dd96b0f47158926d7989808272':
Fix "incall in landscape sometimes" bug #
2523942
Christopher Tate [Sat, 3 Apr 2010 02:14:58 +0000 (19:14 -0700)]
Merge "Fix "incall in landscape sometimes" bug #
2523942" into froyo
Dirk Dougherty [Sat, 3 Apr 2010 01:40:50 +0000 (18:40 -0700)]
am
fc5aa9cf: Merge "doc change: miscellaneous small fixes." into froyo
Merge commit '
fc5aa9cfd103258c45fe1d6c072e93f227a044d8' into froyo-plus-aosp
* commit '
fc5aa9cfd103258c45fe1d6c072e93f227a044d8':
doc change: miscellaneous small fixes.
Dirk Dougherty [Sat, 3 Apr 2010 01:37:10 +0000 (18:37 -0700)]
Merge "doc change: miscellaneous small fixes." into froyo
Amith Yamasani [Sat, 3 Apr 2010 00:24:49 +0000 (17:24 -0700)]
am
0913ce95: Merge "Potential fix for bug:
2564824 : Device runtime restart in BatteryService" into froyo
Merge commit '
0913ce95c29371cb7b58e294a8d60262bc7f4329' into froyo-plus-aosp
* commit '
0913ce95c29371cb7b58e294a8d60262bc7f4329':
Potential fix for bug:
2564824 : Device runtime restart in BatteryService
Amith Yamasani [Sat, 3 Apr 2010 00:20:53 +0000 (17:20 -0700)]
Merge "Potential fix for bug:
2564824 : Device runtime restart in BatteryService" into froyo
Grace Kloba [Fri, 2 Apr 2010 23:46:39 +0000 (16:46 -0700)]
am
b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo
Merge commit '
b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp
* commit '
b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
Make sure when WebView modified mScrollX/Y directly,
Grace Kloba [Fri, 2 Apr 2010 23:41:13 +0000 (16:41 -0700)]
Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo
Adam Powell [Fri, 2 Apr 2010 23:20:54 +0000 (16:20 -0700)]
am
6024ca5c: Fix bug
2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '
6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp
* commit '
6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
Fix bug
2185026 - back button in context menu now calls onContextMenuClosed()
Andreas Huber [Fri, 2 Apr 2010 21:09:11 +0000 (14:09 -0700)]
am
eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo
Merge commit '
eb6e3edc0f21c5c8a574f8086f9622c44c0ff866' into froyo-plus-aosp
* commit '
eb6e3edc0f21c5c8a574f8086f9622c44c0ff866':
Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Andreas Huber [Fri, 2 Apr 2010 21:03:46 +0000 (14:03 -0700)]
Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo
Charles Chen [Fri, 2 Apr 2010 20:45:30 +0000 (13:45 -0700)]
am
6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #
2548048
Merge commit '
6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp
* commit '
6df44727d06548015e741dd8f63716602ed1e5d1':
Unhiding TTS API constants and methods needed for TTS plugin support.
Dianne Hackborn [Fri, 2 Apr 2010 20:39:11 +0000 (13:39 -0700)]
am
e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo
Merge commit '
e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp
* commit '
e13beb09dadfba4806e6784bc7cde1466eb54ca4':
Add a new intent category used for activities running in carmode.
Dianne Hackborn [Fri, 2 Apr 2010 20:35:59 +0000 (13:35 -0700)]
Merge "Add a new intent category used for activities running in carmode." into froyo
Irfan Sheriff [Fri, 2 Apr 2010 19:51:05 +0000 (12:51 -0700)]
am
9c50996b: Merge "Dont start wifi if in airplane mode" into froyo
Merge commit '
9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp
* commit '
9c50996b175a1ee4b0069cba5163310c0189ac36':
Dont start wifi if in airplane mode
Suchi Amalapurapu [Fri, 2 Apr 2010 19:51:01 +0000 (12:51 -0700)]
am
a77acab9: Merge "Handle exceptions when doing dexopt." into froyo
Merge commit '
a77acab9c623a8b63b46d14686cf1a86dd863289' into froyo-plus-aosp
* commit '
a77acab9c623a8b63b46d14686cf1a86dd863289':
Handle exceptions when doing dexopt.
Irfan Sheriff [Fri, 2 Apr 2010 19:47:45 +0000 (12:47 -0700)]
Merge "Dont start wifi if in airplane mode" into froyo
Suchi Amalapurapu [Fri, 2 Apr 2010 19:46:38 +0000 (12:46 -0700)]
Merge "Handle exceptions when doing dexopt." into froyo
Andreas Huber [Fri, 2 Apr 2010 18:21:34 +0000 (11:21 -0700)]
am
29039dee: Merge "Support another kind of iso mpeg4 file." into froyo
Merge commit '
29039deea99a5529d92f7add3f9077ab247d3acd' into froyo-plus-aosp
* commit '
29039deea99a5529d92f7add3f9077ab247d3acd':
Support another kind of iso mpeg4 file.
Andreas Huber [Fri, 2 Apr 2010 18:18:32 +0000 (11:18 -0700)]
Merge "Support another kind of iso mpeg4 file." into froyo
Adam Powell [Fri, 2 Apr 2010 18:06:34 +0000 (11:06 -0700)]
am
21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo
Merge commit '
219909224d9f5fdb4fe1c97fad048894c4619fe7' into froyo-plus-aosp
* commit '
219909224d9f5fdb4fe1c97fad048894c4619fe7':
Fix AbsListView scrolling behavior at edges.
Adam Powell [Fri, 2 Apr 2010 18:02:21 +0000 (11:02 -0700)]
Merge "Fix AbsListView scrolling behavior at edges." into froyo
Daniel Sandler [Fri, 2 Apr 2010 17:59:41 +0000 (10:59 -0700)]
am
25642f0b: Merge "Make desk mode work again." into froyo
Merge commit '
25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp
* commit '
25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
Make desk mode work again.
Daniel Sandler [Fri, 2 Apr 2010 17:54:57 +0000 (10:54 -0700)]
Merge "Make desk mode work again." into froyo
Fred Quintana [Fri, 2 Apr 2010 17:53:22 +0000 (10:53 -0700)]
am
30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Merge commit '
30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp
* commit '
30ed25c252e9eb9923d71676e8f703bb775b7cdf':
revert the stripping of System Group:
Fred Quintana [Fri, 2 Apr 2010 17:47:11 +0000 (10:47 -0700)]
Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Brett Chabot [Fri, 2 Apr 2010 17:28:36 +0000 (10:28 -0700)]
am
c1548e38: Merge "Add test annotations to frameworks common tests." into froyo
Merge commit '
c1548e3819ab4662e6b5f5455f95258b37dc7192' into froyo-plus-aosp
* commit '
c1548e3819ab4662e6b5f5455f95258b37dc7192':
Add test annotations to frameworks common tests.
Brett Chabot [Fri, 2 Apr 2010 17:24:00 +0000 (10:24 -0700)]
Merge "Add test annotations to frameworks common tests." into froyo
Grace Kloba [Fri, 2 Apr 2010 16:19:06 +0000 (09:19 -0700)]
am
61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo
Merge commit '
61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp
* commit '
61c3a13e5f9d20c621f49598a0082063404c5f7e':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Grace Kloba [Fri, 2 Apr 2010 16:14:39 +0000 (09:14 -0700)]
Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo
Jean-Michel Trivi [Fri, 2 Apr 2010 16:12:10 +0000 (09:12 -0700)]
am
9ab05fff: Merge "Fix bug
2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Merge commit '
9ab05fff41e983c9b3175096c320aefced81276b' into froyo-plus-aosp
* commit '
9ab05fff41e983c9b3175096c320aefced81276b':
Fix bug
2565463 Ensure an object cannot appear twice in the
Dave Sparks [Fri, 2 Apr 2010 16:11:56 +0000 (09:11 -0700)]
am
d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug
2560834." into froyo
Merge commit '
d9c16c37ea28933973f32cb434f770226266b675' into froyo-plus-aosp
* commit '
d9c16c37ea28933973f32cb434f770226266b675':
Use local lock for most MediaMetadataRetriever methods. Bug
2560834.
Jean-Michel Trivi [Fri, 2 Apr 2010 15:53:42 +0000 (08:53 -0700)]
Merge "Fix bug
2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Brett Chabot [Fri, 2 Apr 2010 15:53:22 +0000 (08:53 -0700)]
Add test annotations to frameworks common tests.
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
Dave Sparks [Fri, 2 Apr 2010 14:56:44 +0000 (07:56 -0700)]
Merge "Use local lock for most MediaMetadataRetriever methods. Bug
2560834." into froyo
Brett Chabot [Fri, 2 Apr 2010 04:50:00 +0000 (21:50 -0700)]
am
c162668e: Merge "More framework tests cleanup." into froyo
Merge commit '
c162668e870cda9d336741f24c177cd925fef8e0' into froyo-plus-aosp
* commit '
c162668e870cda9d336741f24c177cd925fef8e0':
More framework tests cleanup.
Brett Chabot [Fri, 2 Apr 2010 04:45:41 +0000 (21:45 -0700)]
Merge "More framework tests cleanup." into froyo
Mike Lockwood [Fri, 2 Apr 2010 04:12:56 +0000 (21:12 -0700)]
am
87e72cd3: Merge "Vibrate before shutting down." into froyo
Merge commit '
87e72cd3b327fefc39030a628e9e9b7141791d39' into froyo-plus-aosp
* commit '
87e72cd3b327fefc39030a628e9e9b7141791d39':
Vibrate before shutting down.
Mike Lockwood [Fri, 2 Apr 2010 04:08:53 +0000 (21:08 -0700)]
Merge "Vibrate before shutting down." into froyo
Jim Miller [Fri, 2 Apr 2010 02:37:41 +0000 (19:37 -0700)]
am
bf1259b8: Fix
2538826: Allow aspect of LockPatternView to be customized.
Merge commit '
bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp
* commit '
bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
Fix
2538826: Allow aspect of LockPatternView to be customized.
Mike LeBeau [Fri, 2 Apr 2010 01:14:30 +0000 (18:14 -0700)]
am
af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentNam
Merge commit '
af8c900a18288ef4ddfa2cebfa0555b8a37f92a7' into froyo-plus-aosp
* commit '
af8c900a18288ef4ddfa2cebfa0555b8a37f92a7':
Use flattenToShortString instead of toShortString on ComponentNames to
Mike LeBeau [Fri, 2 Apr 2010 01:11:43 +0000 (18:11 -0700)]
Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentName.unflattenFromString." into froyo
Charles Chen [Fri, 2 Apr 2010 00:59:57 +0000 (17:59 -0700)]
am
ddc2eb8e: Merge "Fix for bug
2564771 - pitch setting between apps can interfere with one another." into froyo
Merge commit '
ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76' into froyo-plus-aosp
* commit '
ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76':
Fix for bug
2564771 - pitch setting between apps can
Charles Chen [Fri, 2 Apr 2010 00:56:47 +0000 (17:56 -0700)]
Merge "Fix for bug
2564771 - pitch setting between apps can interfere with one another." into froyo
Yu Shan Emily Lau [Fri, 2 Apr 2010 00:43:27 +0000 (17:43 -0700)]
am
e11bafec: Add the test template for the media audio manager test.
Merge commit '
e11bafec8d6c887c6ae95fa3d39c202859e86d48' into froyo-plus-aosp
* commit '
e11bafec8d6c887c6ae95fa3d39c202859e86d48':
Add the test template for the media audio manager test.
Mike LeBeau [Fri, 2 Apr 2010 00:42:38 +0000 (17:42 -0700)]
am
e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of b/
2546173" into froyo
Merge commit '
e134279ffa3d5a3871fd39e9e9328b3ab1fec88d' into froyo-plus-aosp
* commit '
e134279ffa3d5a3871fd39e9e9328b3ab1fec88d':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
Mike LeBeau [Thu, 1 Apr 2010 22:30:51 +0000 (15:30 -0700)]
Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of b/
2546173" into froyo
Gilles Debunne [Thu, 1 Apr 2010 21:49:51 +0000 (14:49 -0700)]
am
83d4eb6c: Merge "Refactor in PositionTesterContextMenuListener." into froyo
Merge commit '
83d4eb6c4fc35bd8ce203edde0051d4def8c2cef' into froyo-plus-aosp
* commit '
83d4eb6c4fc35bd8ce203edde0051d4def8c2cef':
Refactor in PositionTesterContextMenuListener.
Gilles Debunne [Thu, 1 Apr 2010 21:47:00 +0000 (14:47 -0700)]
Merge "Refactor in PositionTesterContextMenuListener." into froyo
Brett Chabot [Thu, 1 Apr 2010 21:40:43 +0000 (14:40 -0700)]
am
f6118617: Merge "Remove FrameworkTest package." into froyo
Merge commit '
f6118617350c0c1541550bf3a558460db562b6a4' into froyo-plus-aosp
* commit '
f6118617350c0c1541550bf3a558460db562b6a4':
Remove FrameworkTest package.
Brett Chabot [Thu, 1 Apr 2010 21:36:36 +0000 (14:36 -0700)]
Merge "Remove FrameworkTest package." into froyo
Fred Quintana [Thu, 1 Apr 2010 21:32:51 +0000 (14:32 -0700)]
am
e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo
Merge commit '
e8b1971c7b09f14f2d9a2e12399294798cf2066a' into froyo-plus-aosp
* commit '
e8b1971c7b09f14f2d9a2e12399294798cf2066a':
allow null authtokens to invalidateAuthToken
Fred Quintana [Thu, 1 Apr 2010 21:27:00 +0000 (14:27 -0700)]
Merge "allow null authtokens to invalidateAuthToken" into froyo
Derek Sollenberger [Thu, 1 Apr 2010 19:06:25 +0000 (12:06 -0700)]
am
11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Merge commit '
11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp
* commit '
11fb6144604fbd1148695421e9ab6896701a431b':
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Dirk Dougherty [Thu, 1 Apr 2010 17:40:15 +0000 (10:40 -0700)]
am
2d8234b7: Merge "doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
Merge commit '
2d8234b73d11fdc2178232cabad3ffaa23723405' into froyo-plus-aosp
* commit '
2d8234b73d11fdc2178232cabad3ffaa23723405':
doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
James Dong [Thu, 1 Apr 2010 17:40:11 +0000 (10:40 -0700)]
am
ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Merge commit '
ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp
* commit '
ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
Public API changes for CameraProfile and CamcorderProfile classes
Dirk Dougherty [Thu, 1 Apr 2010 17:35:21 +0000 (10:35 -0700)]
Merge "doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
James Dong [Thu, 1 Apr 2010 17:33:45 +0000 (10:33 -0700)]
Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Robert Greenwalt [Thu, 1 Apr 2010 17:22:51 +0000 (10:22 -0700)]
am
33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Merge commit '
33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp
* commit '
33eb7767fb49482643df80c8b5567da83aa0e49f':
NetworkManagementService: Add interface counters & throttle API
Robert Greenwalt [Thu, 1 Apr 2010 17:19:57 +0000 (10:19 -0700)]
Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
OSDN Git Service
