OSDN Git Service
Eric Laurent [Wed, 25 Nov 2009 19:07:05 +0000 (11:07 -0800)]
am
1565d2ef: Merge change I4ad9ec48 into eclair-mr2
Merge commit '
1565d2efc1fb3fde467cb42d67d921e9cf056381' into eclair-mr2-plus-aosp
* commit '
1565d2efc1fb3fde467cb42d67d921e9cf056381':
Fix A2dpAudioInterface getParameters.
Android (Google) Code Review [Wed, 25 Nov 2009 19:01:17 +0000 (11:01 -0800)]
Merge change I4ad9ec48 into eclair-mr2
* changes:
Fix A2dpAudioInterface getParameters.
Naveen Kalla [Wed, 25 Nov 2009 17:43:51 +0000 (09:43 -0800)]
am
5f69f726: Merge change I3f4f5f05 into eclair-mr2
Merge commit '
5f69f7260ff34b2bed7cc3309f91b750f1a833d3' into eclair-mr2-plus-aosp
* commit '
5f69f7260ff34b2bed7cc3309f91b750f1a833d3':
cdma tones: Fix Call Waiting Tone in the hash map
Android (Google) Code Review [Wed, 25 Nov 2009 17:39:29 +0000 (09:39 -0800)]
Merge change I3f4f5f05 into eclair-mr2
* changes:
cdma tones: Fix Call Waiting Tone in the hash map
Leon Scroggins [Wed, 25 Nov 2009 15:48:09 +0000 (07:48 -0800)]
am
f90b1261: When clicking on a WebTextView, always call nativeMotionUp.
Merge commit '
f90b1261a53bc0bfc772337551eb4c540022cd22' into eclair-mr2-plus-aosp
* commit '
f90b1261a53bc0bfc772337551eb4c540022cd22':
When clicking on a WebTextView, always call nativeMotionUp.
Eric Laurent [Wed, 25 Nov 2009 14:08:44 +0000 (06:08 -0800)]
Fix A2dpAudioInterface getParameters.
A2dpAudioInterface::getParameters() was prepending a ';' to the key value pair returned from underlying AudioHardwareInterface.
Ben Murdoch [Wed, 25 Nov 2009 10:48:52 +0000 (02:48 -0800)]
am
a2d259aa: am
7f7c16de: (-s ours) Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
Merge commit '
a2d259aa4a06eb92af2ef4530ae065497a581496' into eclair-mr2-plus-aosp
* commit '
a2d259aa4a06eb92af2ef4530ae065497a581496':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Ben Murdoch [Wed, 25 Nov 2009 10:43:51 +0000 (02:43 -0800)]
am
7f7c16de: (-s ours) Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
Merge commit '
7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-mr2
* commit '
7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Android (Google) Code Review [Wed, 25 Nov 2009 10:37:27 +0000 (02:37 -0800)]
Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
* changes:
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Dan Egnor [Wed, 25 Nov 2009 01:29:30 +0000 (17:29 -0800)]
am
ee6c7e49: Merge change I2c5380a6 into eclair-mr2
Merge commit '
ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16' into eclair-mr2-plus-aosp
* commit '
ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16':
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix
Android (Google) Code Review [Wed, 25 Nov 2009 01:25:37 +0000 (17:25 -0800)]
Merge change I2c5380a6 into eclair-mr2
* changes:
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix to a race condition) that breaks the caching of non-existent Settings/Secure/ Gservices values (causing lots of unnecessary database queries).
Joe Onorato [Tue, 24 Nov 2009 23:50:48 +0000 (15:50 -0800)]
am
df7edf5d: am
55896f3c: Merge change Ib71193bf into eclair
Merge commit '
df7edf5d92ae3e708e802b68014864fe13184060' into eclair-mr2-plus-aosp
* commit '
df7edf5d92ae3e708e802b68014864fe13184060':
Fix
2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Joe Onorato [Tue, 24 Nov 2009 23:46:24 +0000 (15:46 -0800)]
am
55896f3c: Merge change Ib71193bf into eclair
Merge commit '
55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-mr2
* commit '
55896f3c5121e73e3f657ed14e7ee8937ad72449':
Fix
2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Android (Google) Code Review [Tue, 24 Nov 2009 23:41:32 +0000 (15:41 -0800)]
Merge change Ib71193bf into eclair
* changes:
Fix
2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Robert Greenwalt [Tue, 24 Nov 2009 23:23:42 +0000 (15:23 -0800)]
am
8e2eb583: Merge change I22cf0509 into eclair-mr2
Merge commit '
8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8' into eclair-mr2-plus-aosp
* commit '
8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8':
Add China data to MccTable.
Android (Google) Code Review [Tue, 24 Nov 2009 23:19:28 +0000 (15:19 -0800)]
Merge change I22cf0509 into eclair-mr2
* changes:
Add China data to MccTable.
Dianne Hackborn [Tue, 24 Nov 2009 23:08:13 +0000 (15:08 -0800)]
am
9ad091ab: am
118d92f7: Merge change I16925b91 into eclair
Merge commit '
9ad091ab1065e85222da0927bb33913530f56f65' into eclair-mr2-plus-aosp
* commit '
9ad091ab1065e85222da0927bb33913530f56f65':
Finish fixing issue #
2228381: android.view.InflateException...
Dianne Hackborn [Tue, 24 Nov 2009 23:01:51 +0000 (15:01 -0800)]
am
118d92f7: Merge change I16925b91 into eclair
Merge commit '
118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b' into eclair-mr2
* commit '
118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b':
Finish fixing issue #
2228381: android.view.InflateException...
Mathias Agopian [Tue, 24 Nov 2009 22:53:05 +0000 (14:53 -0800)]
am
1e22cffa: am
63851404: Merge change Ibf0c320a into eclair
Merge commit '
1e22cffa1d7299e725ec2a16689901aaa5790922' into eclair-mr2-plus-aosp
* commit '
1e22cffa1d7299e725ec2a16689901aaa5790922':
When using MDP, we needed to use a texture for diming.
Dan Egnor [Tue, 24 Nov 2009 22:52:31 +0000 (14:52 -0800)]
am
b29fefe6: Merge change Ic4cf6caa into eclair-mr2
Merge commit '
b29fefe6aeed68c22c7711263357348006ab8b79' into eclair-mr2-plus-aosp
* commit '
b29fefe6aeed68c22c7711263357348006ab8b79':
Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg.
Android (Google) Code Review [Tue, 24 Nov 2009 22:43:53 +0000 (14:43 -0800)]
Merge change I16925b91 into eclair
* changes:
Finish fixing issue #
2228381: android.view.InflateException...
Mathias Agopian [Tue, 24 Nov 2009 22:43:39 +0000 (14:43 -0800)]
am
63851404: Merge change Ibf0c320a into eclair
Merge commit '
638514048141bf9f28a4bede77b83c3238f5c194' into eclair-mr2
* commit '
638514048141bf9f28a4bede77b83c3238f5c194':
When using MDP, we needed to use a texture for diming.
Jim Miller [Tue, 24 Nov 2009 22:31:37 +0000 (14:31 -0800)]
resolved conflicts for merge of
a442e791 to eclair-mr2-plus-aosp
Android (Google) Code Review [Tue, 24 Nov 2009 22:29:46 +0000 (14:29 -0800)]
Merge change Ic4cf6caa into eclair-mr2
* changes:
Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg. (In preparation for not copying to /data/dontpanic/last_kmsg at all.)
Android (Google) Code Review [Tue, 24 Nov 2009 22:26:28 +0000 (14:26 -0800)]
Merge change Ibf0c320a into eclair
* changes:
When using MDP, we needed to use a texture for diming.
Jim Miller [Tue, 24 Nov 2009 22:04:44 +0000 (14:04 -0800)]
am
35cdb484: Merge change I6c6c166b into eclair
Merge commit '
35cdb484928b34fd517e49e200aa79aa64b4eeb4' into eclair-mr2
* commit '
35cdb484928b34fd517e49e200aa79aa64b4eeb4':
Fix
2268841: Updated portrait tab lockscreen to match latest PPL.
Android (Google) Code Review [Tue, 24 Nov 2009 22:00:54 +0000 (14:00 -0800)]
Merge change I6c6c166b into eclair
* changes:
Fix
2268841: Updated portrait tab lockscreen to match latest PPL.
Swarna Kumar [Tue, 24 Nov 2009 21:37:20 +0000 (13:37 -0800)]
am
20342ca8: am
7f8e3409: Merge change I816428ae into eclair
Merge commit '
20342ca83012b442913b409a9218635de9bd6aa6' into eclair-mr2-plus-aosp
* commit '
20342ca83012b442913b409a9218635de9bd6aa6':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Swarna Kumar [Tue, 24 Nov 2009 21:33:13 +0000 (13:33 -0800)]
am
7f8e3409: Merge change I816428ae into eclair
Merge commit '
7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2
* commit '
7f8e34091efdee1a383280b08585f8254472c1fd':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Android (Google) Code Review [Tue, 24 Nov 2009 21:28:45 +0000 (13:28 -0800)]
Merge change I816428ae into eclair
* changes:
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness. Bug number :
2177113
Jason Sams [Tue, 24 Nov 2009 20:53:32 +0000 (12:53 -0800)]
am
66358e24: am
9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '
66358e24a6bbc2017c2edd921a64e616b4c9cac4' into eclair-mr2-plus-aosp
* commit '
66358e24a6bbc2017c2edd921a64e616b4c9cac4':
Force a crash under conditions where white square bug in all apps is likely to occur.
Jason Sams [Tue, 24 Nov 2009 20:49:36 +0000 (12:49 -0800)]
am
9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '
9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-mr2
* commit '
9dab667e03632181e487a04a8a170b3fa0bd5037':
Force a crash under conditions where white square bug in all apps is likely to occur.
Fred Quintana [Tue, 24 Nov 2009 19:03:05 +0000 (11:03 -0800)]
am
2464acc6: moved the gdata library to vendor/google
Merge commit '
2464acc6da6393f0163894094468f68b8e496cea' into eclair-mr2-plus-aosp
* commit '
2464acc6da6393f0163894094468f68b8e496cea':
moved the gdata library to vendor/google
Trevor Johns [Tue, 24 Nov 2009 17:45:09 +0000 (09:45 -0800)]
am
82d4b5cc: am
99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '
82d4b5ccaf5518ed9286d89e60ac9a595239ac35' into eclair-mr2-plus-aosp
* commit '
82d4b5ccaf5518ed9286d89e60ac9a595239ac35':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Trevor Johns [Tue, 24 Nov 2009 17:40:19 +0000 (09:40 -0800)]
am
99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '
99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2
* commit '
99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Android (Google) Code Review [Tue, 24 Nov 2009 17:35:35 +0000 (09:35 -0800)]
Merge change Iefdb6f97 into eclair
* changes:
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Jean-Baptiste Queru [Tue, 24 Nov 2009 17:22:50 +0000 (09:22 -0800)]
merge from open-source master
Leon Scroggins [Tue, 24 Nov 2009 14:29:17 +0000 (06:29 -0800)]
am
ecfc0eba: Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit '
ecfc0eba609f88579ea5b70c57e6763ee3a28e5d' into eclair-mr2-plus-aosp
* commit '
ecfc0eba609f88579ea5b70c57e6763ee3a28e5d':
Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Mathias Agopian [Tue, 24 Nov 2009 06:40:42 +0000 (22:40 -0800)]
When using MDP, we needed to use a texture for diming.
Dave Sparks [Tue, 24 Nov 2009 04:03:28 +0000 (20:03 -0800)]
am
1e914ac7: am
16cc72bd: Fix simulator build.
Merge commit '
1e914ac7fce9523b5a932389798589eba91ca4dd' into eclair-mr2-plus-aosp
* commit '
1e914ac7fce9523b5a932389798589eba91ca4dd':
Fix simulator build.
Dave Sparks [Tue, 24 Nov 2009 04:03:03 +0000 (20:03 -0800)]
am
ebcb7c31: am
8424ec32: Merge change I0f9a53d4 into eclair
Merge commit '
ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp
* commit '
ebcb7c3167e76c19d4721dbc472772744918e868':
Set metadata retriever thread group to the caller's group.
Dave Sparks [Tue, 24 Nov 2009 03:58:33 +0000 (19:58 -0800)]
am
16cc72bd: Fix simulator build.
Merge commit '
16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2
* commit '
16cc72bdef471ffeee3f61eba8262783de248b04':
Fix simulator build.
Dave Sparks [Tue, 24 Nov 2009 03:58:00 +0000 (19:58 -0800)]
am
8424ec32: Merge change I0f9a53d4 into eclair
Merge commit '
8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2
* commit '
8424ec323b2bc38887370c75e2c1fcd84bcdb013':
Set metadata retriever thread group to the caller's group.
Dan Egnor [Tue, 24 Nov 2009 03:14:23 +0000 (19:14 -0800)]
am
b59573cf: Merge change I06fb08c4 into eclair-mr2
Merge commit '
b59573cf53c8f09ac25fe0bfaf1d7067604ee983' into eclair-mr2-plus-aosp
* commit '
b59573cf53c8f09ac25fe0bfaf1d7067604ee983':
Expand db_operation logging to prepare for widespread sample collection:
Android (Google) Code Review [Tue, 24 Nov 2009 03:10:17 +0000 (19:10 -0800)]
Merge change I06fb08c4 into eclair-mr2
* changes:
Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)
Android (Google) Code Review [Tue, 24 Nov 2009 01:58:24 +0000 (17:58 -0800)]
Merge change I0f9a53d4 into eclair
* changes:
Set metadata retriever thread group to the caller's group.
Dave Sparks [Tue, 24 Nov 2009 01:50:22 +0000 (17:50 -0800)]
am
f52ebbfc: am
9a219519: Merge change I2d32301b into eclair
Merge commit '
f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb' into eclair-mr2-plus-aosp
* commit '
f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb':
Add 4 new notification sounds.
Dave Sparks [Tue, 24 Nov 2009 01:45:57 +0000 (17:45 -0800)]
am
9a219519: Merge change I2d32301b into eclair
Merge commit '
9a219519786ce6702c57ec1f1bffe2260fc663a9' into eclair-mr2
* commit '
9a219519786ce6702c57ec1f1bffe2260fc663a9':
Add 4 new notification sounds.
Android (Google) Code Review [Tue, 24 Nov 2009 01:42:41 +0000 (17:42 -0800)]
Merge change I2d32301b into eclair
* changes:
Add 4 new notification sounds.
Jason Sams [Tue, 24 Nov 2009 00:24:17 +0000 (16:24 -0800)]
am
6a2500a3: am
39dbb099: Merge change I36176536 into eclair
Merge commit '
6a2500a330ef41cbfca40827b60e9f5efdf72db7' into eclair-mr2-plus-aosp
* commit '
6a2500a330ef41cbfca40827b60e9f5efdf72db7':
Fix ref counting bug that could cause memory leak in allApps.
Jason Sams [Tue, 24 Nov 2009 00:19:37 +0000 (16:19 -0800)]
am
39dbb099: Merge change I36176536 into eclair
Merge commit '
39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2
* commit '
39dbb099974f2c8e1154f28123e53be14c47a76d':
Fix ref counting bug that could cause memory leak in allApps.
Android (Google) Code Review [Tue, 24 Nov 2009 00:14:13 +0000 (16:14 -0800)]
Merge change I36176536 into eclair
* changes:
Fix ref counting bug that could cause memory leak in allApps.
Dianne Hackborn [Tue, 24 Nov 2009 00:03:16 +0000 (16:03 -0800)]
am
cfe90ce4: am
05799981: Fix issue #
2281046: Size and pressure don\'t change
Merge commit '
cfe90ce461eacf3ae6a8556594a0f682a31cfb84' into eclair-mr2-plus-aosp
* commit '
cfe90ce461eacf3ae6a8556594a0f682a31cfb84':
Fix issue #
2281046: Size and pressure don't change
Dianne Hackborn [Mon, 23 Nov 2009 23:58:18 +0000 (15:58 -0800)]
am
05799981: Fix issue #
2281046: Size and pressure don\'t change
Merge commit '
05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-mr2
* commit '
05799981d8d930e0b929cdb99f9407e3ee18c142':
Fix issue #
2281046: Size and pressure don't change
Andreas Huber [Mon, 23 Nov 2009 23:39:26 +0000 (15:39 -0800)]
am
44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '
44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp
* commit '
44e15c44ad10b36bd3649b21ea7432348e2f05f8':
Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
Andreas Huber [Mon, 23 Nov 2009 22:42:30 +0000 (14:42 -0800)]
am
1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '
1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp
* commit '
1f52229453c3df8eaeda64133bd332b01589354f':
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
Android (Google) Code Review [Mon, 23 Nov 2009 22:39:03 +0000 (14:39 -0800)]
Merge change I24b0a95d into eclair-mr2
* changes:
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
Andreas Huber [Mon, 23 Nov 2009 22:31:25 +0000 (14:31 -0800)]
am
e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit '
e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp
* commit '
e71a6408867a80f847cd3f7671f6ef009f67a78e':
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
Dirk Dougherty [Mon, 23 Nov 2009 22:31:01 +0000 (14:31 -0800)]
am
e0030418: am
bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit '
e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp
* commit '
e0030418fd4b9a9a2d0422a5538a76ca6b40710c':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Eric Olsen [Mon, 23 Nov 2009 22:30:35 +0000 (14:30 -0800)]
am
b2796da2: am
0d631b9b: Merge change Ie7096ebb into eclair
Merge commit '
b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp
* commit '
b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f':
Add logging of headset events to help debug issue.
Android (Google) Code Review [Mon, 23 Nov 2009 22:26:46 +0000 (14:26 -0800)]
Merge change I1bceff91 into eclair-mr2
* changes:
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
Dirk Dougherty [Mon, 23 Nov 2009 21:55:50 +0000 (13:55 -0800)]
am
bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit '
bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-mr2
* commit '
bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Eric Olsen [Mon, 23 Nov 2009 21:55:25 +0000 (13:55 -0800)]
am
0d631b9b: Merge change Ie7096ebb into eclair
Merge commit '
0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2
* commit '
0d631b9b58db54bee58da717b38b8020bc3d0437':
Add logging of headset events to help debug issue.
Fred Quintana [Mon, 23 Nov 2009 21:47:00 +0000 (13:47 -0800)]
am
4174016d: Merge change I53e3a20e into eclair-mr2
Merge commit '
4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp
* commit '
4174016dbd043eda493e9cd1925ed84549c7b3c0':
move SubscribedFeeds to GSF
Android (Google) Code Review [Mon, 23 Nov 2009 21:42:24 +0000 (13:42 -0800)]
Merge change I53e3a20e into eclair-mr2
* changes:
move SubscribedFeeds to GSF
Android (Google) Code Review [Mon, 23 Nov 2009 21:20:46 +0000 (13:20 -0800)]
Merge change Ie7096ebb into eclair
* changes:
Add logging of headset events to help debug issue.
Scott Main [Mon, 23 Nov 2009 21:14:01 +0000 (13:14 -0800)]
am
98c11248: am
3fa1cb05: am
5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '
98c11248becafa61d29aea8a7e10adf418a6c197' into eclair-mr2-plus-aosp
* commit '
98c11248becafa61d29aea8a7e10adf418a6c197':
droiddoc change: add flag to offline docs build to signal
Mike Lockwood [Mon, 23 Nov 2009 21:13:39 +0000 (13:13 -0800)]
am
e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit '
e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp
* commit '
e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
Add window manager support for overriding button and keyboard backlight values.
Scott Main [Mon, 23 Nov 2009 21:09:17 +0000 (13:09 -0800)]
am
3fa1cb05: am
5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '
3fa1cb059e76d8b83634a4117a7b2ceca438ae7e' into eclair-mr2
* commit '
3fa1cb059e76d8b83634a4117a7b2ceca438ae7e':
droiddoc change: add flag to offline docs build to signal
Scott Main [Mon, 23 Nov 2009 21:04:27 +0000 (13:04 -0800)]
am
5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '
5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair
* commit '
5e7f1fbe161d7015dde6e893351238749f906c8a':
droiddoc change: add flag to offline docs build to signal
Android (Google) Code Review [Mon, 23 Nov 2009 20:56:19 +0000 (12:56 -0800)]
Merge change Id2ee762d into eclair-sdk
* changes:
droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.
Android (Google) Code Review [Mon, 23 Nov 2009 20:20:04 +0000 (12:20 -0800)]
Merge change I60dfecdc into eclair-mr2
* changes:
Add window manager support for overriding button and keyboard backlight values.
Grace Kloba [Mon, 23 Nov 2009 20:12:52 +0000 (12:12 -0800)]
am
ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit '
ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp
* commit '
ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
Expose some debugging tools of the WebView.
Dan Egnor [Mon, 23 Nov 2009 20:12:28 +0000 (12:12 -0800)]
am
596de923: am
9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '
596de923b23744e693967e1f3a644bb60c3ab30b' into eclair-mr2-plus-aosp
* commit '
596de923b23744e693967e1f3a644bb60c3ab30b':
Add CPUFREQ_STATS event tag
Android (Google) Code Review [Mon, 23 Nov 2009 20:07:20 +0000 (12:07 -0800)]
Merge change I8ae1b41a into eclair-mr2
* changes:
Expose some debugging tools of the WebView.
Dan Egnor [Mon, 23 Nov 2009 20:03:47 +0000 (12:03 -0800)]
am
9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '
9854deae10aaf39999a95e440ee3dec939d47179' into eclair-mr2
* commit '
9854deae10aaf39999a95e440ee3dec939d47179':
Add CPUFREQ_STATS event tag
Android (Google) Code Review [Mon, 23 Nov 2009 19:57:08 +0000 (11:57 -0800)]
Merge change I1691f3d3 into eclair
* changes:
Add CPUFREQ_STATS event tag DO NOT MERGE
Eric Laurent [Mon, 23 Nov 2009 19:21:01 +0000 (11:21 -0800)]
am
132dab8f: am
a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '
132dab8f91f5e87581660069753f238ea9914732' into eclair-mr2-plus-aosp
* commit '
132dab8f91f5e87581660069753f238ea9914732':
Fix issue
2265111: Loss of downlink audio while listening, and get a MT call.
Eric Laurent [Mon, 23 Nov 2009 19:16:27 +0000 (11:16 -0800)]
am
a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '
a0f9a4f73579c2afa4dd82499a69abce94a3f23f' into eclair-mr2
* commit '
a0f9a4f73579c2afa4dd82499a69abce94a3f23f':
Fix issue
2265111: Loss of downlink audio while listening, and get a MT call.
Dianne Hackborn [Mon, 23 Nov 2009 19:12:04 +0000 (11:12 -0800)]
am
41039247: am
8abd5f0d: Fix issue #
2267665 IME keyboard appears as Blank in compose view...
Merge commit '
4103924742c376716ce5866f6d2f53eac4f3cb59' into eclair-mr2-plus-aosp
* commit '
4103924742c376716ce5866f6d2f53eac4f3cb59':
Fix issue #
2267665 IME keyboard appears as Blank in compose view...
Android (Google) Code Review [Mon, 23 Nov 2009 19:11:55 +0000 (11:11 -0800)]
Merge change I2083b297 into eclair
* changes:
Fix issue
2265111: Loss of downlink audio while listening, and get a MT call.
Dianne Hackborn [Mon, 23 Nov 2009 19:05:54 +0000 (11:05 -0800)]
am
8abd5f0d: Fix issue #
2267665 IME keyboard appears as Blank in compose view...
Merge commit '
8abd5f0d519afa787e7c64e429df17ccc661ce75' into eclair-mr2
* commit '
8abd5f0d519afa787e7c64e429df17ccc661ce75':
Fix issue #
2267665 IME keyboard appears as Blank in compose view...
Andreas Huber [Mon, 23 Nov 2009 18:51:41 +0000 (10:51 -0800)]
am
bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit '
bbd6cb463b405fc90912dee470fe6c7b8c6b1f54' into eclair-mr2-plus-aosp
* commit '
bbd6cb463b405fc90912dee470fe6c7b8c6b1f54':
Squashed commit of the following:
Android (Google) Code Review [Mon, 23 Nov 2009 18:46:25 +0000 (10:46 -0800)]
Merge change Ib1b7bce4 into eclair-mr2
* changes:
Squashed commit of the following:
Mike Lockwood [Mon, 23 Nov 2009 18:45:24 +0000 (10:45 -0800)]
am
34c5813e: am
174b7269: Merge change Id886fb28 into eclair
Merge commit '
34c5813e488fd4f044e545f177a20f553580ce6a' into eclair-mr2-plus-aosp
* commit '
34c5813e488fd4f044e545f177a20f553580ce6a':
Fix deadlock in WindowManagerService.reenableKeyguard()
Mike Lockwood [Mon, 23 Nov 2009 18:40:13 +0000 (10:40 -0800)]
am
174b7269: Merge change Id886fb28 into eclair
Merge commit '
174b726917c12d61f9135a180afc8413d845dc2d' into eclair-mr2
* commit '
174b726917c12d61f9135a180afc8413d845dc2d':
Fix deadlock in WindowManagerService.reenableKeyguard()
Android (Google) Code Review [Mon, 23 Nov 2009 18:36:32 +0000 (10:36 -0800)]
Merge change Id886fb28 into eclair
* changes:
Fix deadlock in WindowManagerService.reenableKeyguard()
Dan Egnor [Mon, 23 Nov 2009 18:15:34 +0000 (10:15 -0800)]
am
cd979d55: Merge change I494a1dc5 into eclair-mr2
Merge commit '
cd979d555fbf991bdc59b3521281786e78e809fc' into eclair-mr2-plus-aosp
* commit '
cd979d555fbf991bdc59b3521281786e78e809fc':
Add OperationScheduler (and test) to the common static library;
Android (Google) Code Review [Mon, 23 Nov 2009 18:10:51 +0000 (10:10 -0800)]
Merge change I494a1dc5 into eclair-mr2
* changes:
Add OperationScheduler (and test) to the common static library; includes new string parsing function (and test).
Daniel Sandler [Mon, 23 Nov 2009 16:50:12 +0000 (08:50 -0800)]
am
40c1dbf0: am
a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '
40c1dbf081035f878b96dd67ef112eb49001c087' into eclair-mr2-plus-aosp
* commit '
40c1dbf081035f878b96dd67ef112eb49001c087':
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Daniel Sandler [Mon, 23 Nov 2009 16:44:27 +0000 (08:44 -0800)]
am
a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '
a59a01ab2b959a8a5aeb09dd664d5be193fd8219' into eclair-mr2
* commit '
a59a01ab2b959a8a5aeb09dd664d5be193fd8219':
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Android (Google) Code Review [Mon, 23 Nov 2009 16:39:24 +0000 (08:39 -0800)]
Merge change I43f72dd1 into eclair
* changes:
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Jaikumar Ganesh [Mon, 23 Nov 2009 06:10:15 +0000 (22:10 -0800)]
am
8631e554: am
ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '
8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp
* commit '
8631e55425b2ab81eb74396e6834c6f7a4549804':
Fix pairings lost on reboot.
Jaikumar Ganesh [Mon, 23 Nov 2009 06:02:17 +0000 (22:02 -0800)]
am
ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '
ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2
* commit '
ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
Android (Google) Code Review [Mon, 23 Nov 2009 05:54:29 +0000 (21:54 -0800)]
Merge change Ia3acc2ee into eclair
* changes:
Fix pairings lost on reboot.
Dan Egnor [Sat, 21 Nov 2009 02:31:33 +0000 (18:31 -0800)]
Add OperationScheduler (and test) to the common static library;
includes new string parsing function (and test).
Eric Laurent [Sat, 21 Nov 2009 08:26:09 +0000 (00:26 -0800)]
am
949c572a: am
e7800946: Merge change I49f02be9 into eclair
Merge commit '
949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp
* commit '
949c572a16881aa40079a42bf7682637b23eb16a':
Issue
2265163: Audio still reported routed through earpiece on sholes
Eric Laurent [Sat, 21 Nov 2009 08:21:15 +0000 (00:21 -0800)]
am
e7800946: Merge change I49f02be9 into eclair
Merge commit '
e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2
* commit '
e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
Issue
2265163: Audio still reported routed through earpiece on sholes
Android (Google) Code Review [Sat, 21 Nov 2009 08:18:24 +0000 (00:18 -0800)]
Merge change I49f02be9 into eclair
* changes:
Issue
2265163: Audio still reported routed through earpiece on sholes
Scott Main [Sat, 21 Nov 2009 01:12:37 +0000 (17:12 -0800)]
am
30a4b8a1: am
256da9fb: am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
30a4b8a180813ae9a1846fdd7219ebe5592eb06b' into eclair-mr2-plus-aosp
* commit '
30a4b8a180813ae9a1846fdd7219ebe5592eb06b':
docs change for ESR: add platform notes document for
OSDN Git Service
