OSDN Git Service
Joe Onorato [Wed, 25 Nov 2009 21:58:28 +0000 (13:58 -0800)]
am
bcab01f6: Merge change Ic9f6bf94 into eclair
Merge commit '
bcab01f6d0158c4d928f42b034949dc9608665a6' into eclair-mr2
* commit '
bcab01f6d0158c4d928f42b034949dc9608665a6':
Add a test app that will drain the battery. NOT IN BUILD.
Android (Google) Code Review [Wed, 25 Nov 2009 21:52:08 +0000 (13:52 -0800)]
Merge change Ic9f6bf94 into eclair
* changes:
Add a test app that will drain the battery. NOT IN BUILD.
Jack Palevich [Wed, 25 Nov 2009 21:48:54 +0000 (13:48 -0800)]
am
ca00dee2: Merge change I5aa3adcf into eclair
Merge commit '
ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2
* commit '
ca00dee21425882619aef4ecbe3e0d08de0544e5':
Improve the exception message text by including eglGetError().
Android (Google) Code Review [Wed, 25 Nov 2009 21:43:07 +0000 (13:43 -0800)]
Merge change I5aa3adcf into eclair
* changes:
Improve the exception message text by including eglGetError().
Android (Google) Code Review [Wed, 25 Nov 2009 21:41:34 +0000 (13:41 -0800)]
Merge change Id6ccc9bc into eclair-mr2
* changes:
Update documentation: The width of the image for face detection must be even.
Android (Google) Code Review [Wed, 25 Nov 2009 21:40:10 +0000 (13:40 -0800)]
Merge change I5ec249ab into eclair-mr2
* changes:
More elimination of Formatter (I was tired of waiting several seconds for "dumpsys dropbox"...).
Dianne Hackborn [Wed, 25 Nov 2009 21:03:42 +0000 (13:03 -0800)]
am
8e1985d4: Merge change Ie552036f into eclair
Merge commit '
8e1985d4f28bfa9bea7db05f324759991d4e59e9' into eclair-mr2
* commit '
8e1985d4f28bfa9bea7db05f324759991d4e59e9':
Fix issue #
2286419: maxSdkVersion causes existing apps to disappear.
Brett Chabot [Wed, 25 Nov 2009 21:02:55 +0000 (13:02 -0800)]
am
d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit '
d782b4b6f3411ece7299f414783baa3758756bbe' into eclair-mr2
* commit '
d782b4b6f3411ece7299f414783baa3758756bbe':
Add keyguard permission to instrumented ImfTest package.
Android (Google) Code Review [Wed, 25 Nov 2009 20:59:48 +0000 (12:59 -0800)]
Merge change Ieb7a7d57 into eclair-mr2
* changes:
Change the DropBoxManager API slightly (this is public, but not yet released) -- take a File instead of a ParcelFileDescriptor (gets opened internally) -- that way the caller doesn't have to worry about closing their PFD and so on. (Pretty much 100% of the time the caller will be uploading a file, anyway.)
Android (Google) Code Review [Wed, 25 Nov 2009 20:55:44 +0000 (12:55 -0800)]
Merge change Ie552036f into eclair
* changes:
Fix issue #
2286419: maxSdkVersion causes existing apps to disappear.
Android (Google) Code Review [Wed, 25 Nov 2009 20:34:28 +0000 (12:34 -0800)]
Merge change Id7b9903e into eclair-mr2
* changes:
Add setAttentionLight() to IPowerManager for the Phone app.
Android (Google) Code Review [Wed, 25 Nov 2009 19:54:17 +0000 (11:54 -0800)]
Merge change I4413e8bc into eclair-mr2
* changes:
close file descriptors passed to drop box
Android (Google) Code Review [Wed, 25 Nov 2009 19:49:32 +0000 (11:49 -0800)]
Merge change I086d681f into eclair-mr2
* changes:
Remove HardwareService and move vibrator support to VibratorService.
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.
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
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: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.
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: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
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: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...
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.
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: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: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.
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.
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 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.
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: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: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 [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
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).
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.
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: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.
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: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.
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...
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: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()
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: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: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: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:08:09 +0000 (17:08 -0800)]
am
256da9fb: am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
256da9fb007ac0722a5b1854befda7e7bed2564e' into eclair-mr2
* commit '
256da9fb007ac0722a5b1854befda7e7bed2564e':
docs change for ESR: add platform notes document for
Scott Main [Sat, 21 Nov 2009 01:03:29 +0000 (17:03 -0800)]
am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
160ab363d738728456d561bb80d54d3448e7580a' into eclair
* commit '
160ab363d738728456d561bb80d54d3448e7580a':
docs change for ESR: add platform notes document for
Android (Google) Code Review [Sat, 21 Nov 2009 00:59:57 +0000 (16:59 -0800)]
Merge change I0c172ebf into eclair-sdk
* changes:
docs change for ESR: add platform notes document for Android 2.0.1. Also update the homepage sdk and adp announcements.
Dianne Hackborn [Sat, 21 Nov 2009 00:43:20 +0000 (16:43 -0800)]
am
af1f42be: Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit '
af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2
* commit '
af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Dianne Hackborn [Fri, 20 Nov 2009 23:20:34 +0000 (15:20 -0800)]
am
1824ec8c: Merge change If2b0bbed into eclair
Merge commit '
1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2
* commit '
1824ec8c127e3a8ef602d027e3c10d81f28320e8':
Debugging for issue #
2228381 android.view.InflateException
Android (Google) Code Review [Fri, 20 Nov 2009 23:12:33 +0000 (15:12 -0800)]
Merge change If2b0bbed into eclair
* changes:
Debugging for issue #
2228381 android.view.InflateException
Android (Google) Code Review [Fri, 20 Nov 2009 22:56:21 +0000 (14:56 -0800)]
Merge change I3ae1fb19 into eclair-mr2
* changes:
Increase the default wake lock timeout.
Dianne Hackborn [Fri, 20 Nov 2009 22:26:42 +0000 (14:26 -0800)]
Debugging for issue #
2228381 android.view.InflateException
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account
Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)
Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
Evan Millar [Fri, 20 Nov 2009 22:22:30 +0000 (14:22 -0800)]
am
633177cb: Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '
633177cbdc21b9e8f2153069965fb6aa30b8cb8f' into eclair-mr2
* commit '
633177cbdc21b9e8f2153069965fb6aa30b8cb8f':
Move updated 6.xml from eclair-sholes-release into eclair
Mike Lockwood [Fri, 20 Nov 2009 21:32:17 +0000 (13:32 -0800)]
am
a1ce6551: Merge change I69324a33 into eclair
Merge commit '
a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2' into eclair-mr2
* commit '
a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2':
AlarmManagerService: Fix daylight savings time offset computation
Android (Google) Code Review [Fri, 20 Nov 2009 21:28:12 +0000 (13:28 -0800)]
Merge change I69324a33 into eclair
* changes:
AlarmManagerService: Fix daylight savings time offset computation
Dirk Dougherty [Fri, 20 Nov 2009 21:13:25 +0000 (13:13 -0800)]
am
055b4392: Merge change I0a17a960 into eclair
Merge commit '
055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-mr2
* commit '
055b439289f38c5a1d3bd43c0e218a4cbb93773d':
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Android (Google) Code Review [Fri, 20 Nov 2009 21:08:06 +0000 (13:08 -0800)]
Merge change I0a17a960 into eclair
* changes:
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Yu Shan Emily Lau [Fri, 20 Nov 2009 20:03:34 +0000 (12:03 -0800)]
am
9ed314ce: Merge change Ib3191441 into eclair
Merge commit '
9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2
* commit '
9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
Android (Google) Code Review [Fri, 20 Nov 2009 19:59:28 +0000 (11:59 -0800)]
Merge change Ib3191441 into eclair
* changes:
Add the checking for mediaplayer stress test.
Scott Main [Fri, 20 Nov 2009 18:00:55 +0000 (10:00 -0800)]
am
2a6a149f: am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-mr2
* commit '
2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 18:00:28 +0000 (10:00 -0800)]
am
e1611399: am
6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '
e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2
* commit '
e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
Scott Main [Fri, 20 Nov 2009 17:54:52 +0000 (09:54 -0800)]
am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair
* commit '
820a4e7dd6adeff162a92ca40ebe2f109561036b':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 17:54:22 +0000 (09:54 -0800)]
am
6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '
6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '
6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Eric Laurent [Thu, 19 Nov 2009 17:00:56 +0000 (09:00 -0800)]
Issue
2265163: Audio still reported routed through earpiece on sholes
This is a second attempt to fix the audio routed to earpiece syndrom.
The root cause identified this time is the crash of an application having an active AudioTrack playing on the VOICE_CALL stream type.
When this happens, the AudioTrack destructor is not called and the audio policy manager is not notified of the track stop.
Results a situation where the VOICE_CALL stream is considered as always in use by audio policy manager which makes that audio is routed to earpiece.
The fix consists in moving the track start/stop/close notification to audio policiy manager from AudioTrack to AudioFlinger Track objet.
The net result is that in the case of a client application crash, the AudioFlinger TrackHandle object (which implements the remote side of the IAudioTrack binder interface) destructor is called which in turn destroys the Track object and we can notify the audio policy manager of the track stop and removal.
The same modification is made for AudioRecord although no bug related to record has been reported yet.
Also fixed a potential problem if record stop is called while the record thread is exiting.
Android (Google) Code Review [Fri, 20 Nov 2009 07:14:37 +0000 (23:14 -0800)]
Merge change I903ce7b1 into eclair-mr2
* changes:
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Joe Onorato [Fri, 20 Nov 2009 05:20:18 +0000 (21:20 -0800)]
am
57bda83d: Merge change I4f614c9e into eclair
Merge commit '
57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2
* commit '
57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
Add a test app that has 100 icons. None of them do anything when clicked.
Android (Google) Code Review [Fri, 20 Nov 2009 04:17:06 +0000 (20:17 -0800)]
Merge change I4f614c9e into eclair
* changes:
Add a test app that has 100 icons. None of them do anything when clicked.
Mathias Agopian [Fri, 20 Nov 2009 03:07:36 +0000 (19:07 -0800)]
am
13feccf5: Merge change I39f0003e into eclair
Merge commit '
13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-mr2
* commit '
13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
fix [
2235414] libagl glDeleteBuffers() crashes
Android (Google) Code Review [Fri, 20 Nov 2009 03:03:53 +0000 (19:03 -0800)]
Merge change I39f0003e into eclair
* changes:
fix [
2235414] libagl glDeleteBuffers() crashes
Android (Google) Code Review [Fri, 20 Nov 2009 02:50:48 +0000 (18:50 -0800)]
Merge change I27b1bb90 into eclair-mr2
* changes:
Refactor vCard test code and modify unit tests.
Dianne Hackborn [Fri, 20 Nov 2009 02:06:06 +0000 (18:06 -0800)]
am
524812fb: Merge change I7d40ad9a into eclair
Merge commit '
524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-mr2
* commit '
524812fbf583db5053ff56f7a146fa8fe9296742':
More on issue #
2271640: Fix wallpaper etc docs
Android (Google) Code Review [Fri, 20 Nov 2009 02:01:30 +0000 (18:01 -0800)]
Merge change I7d40ad9a into eclair
* changes:
More on issue #
2271640: Fix wallpaper etc docs
Mathias Agopian [Fri, 20 Nov 2009 01:32:05 +0000 (17:32 -0800)]
fix [
2235414] libagl glDeleteBuffers() crashes
don't dereference null pointers, would happen if one of the array wasn't bound.