OSDN Git Service
Android (Google) Code Review [Wed, 2 Dec 2009 23:16:58 +0000 (15:16 -0800)]
Merge change I749d6801 into eclair-mr2
* changes:
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set and minor fixes.
Eric Fischer [Wed, 2 Dec 2009 23:11:36 +0000 (15:11 -0800)]
am
6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit '
6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-mr2
* commit '
6d5c42ef00a46e0b560b3d15ba73d89d94072af8':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 2 Dec 2009 23:01:35 +0000 (15:01 -0800)]
Merge change Id0704505 into eclair
* changes:
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 2 Dec 2009 21:02:36 +0000 (13:02 -0800)]
Merge change I3fbd0a2f into eclair-mr2
* changes:
Generate a calendar static Java library.
Android (Google) Code Review [Wed, 2 Dec 2009 19:43:56 +0000 (11:43 -0800)]
Merge change I097b1e77 into eclair-mr2
* changes:
Add PageCacheCapacity to the WebSettings.
Android (Google) Code Review [Wed, 2 Dec 2009 19:31:35 +0000 (11:31 -0800)]
Merge change Iafa92b8f into eclair-mr2
* changes:
remove accounts for authenticators that are uninstalled
Android (Google) Code Review [Wed, 2 Dec 2009 19:30:34 +0000 (11:30 -0800)]
Merge change I6430912f into eclair-mr2
* changes:
New constants for db upgrade.
Wink Saville [Wed, 2 Dec 2009 19:26:23 +0000 (11:26 -0800)]
am
cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit '
cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2
* commit '
cc6ff2bc6011294367d9a8c644f811449e952eb7':
Cleanup @hide and @deprecated directives.
Amith Yamasani [Wed, 2 Dec 2009 17:50:40 +0000 (09:50 -0800)]
am
a9791d30: Merge change Iae3ed706 into eclair
Merge commit '
a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-mr2
* commit '
a9791d304b8ec03e04ad4533b1820a64794e1bcc':
Add new setting for notification light pulsing. Bug #
2238250
Dirk Dougherty [Wed, 2 Dec 2009 17:49:21 +0000 (09:49 -0800)]
am
43810507: Merge change Ic8231560 into eclair
Merge commit '
43810507b75cd492e8177ee082e688f87f0ab49c' into eclair-mr2
* commit '
43810507b75cd492e8177ee082e688f87f0ab49c':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Eric Laurent [Wed, 2 Dec 2009 17:48:52 +0000 (09:48 -0800)]
am
1ac56b60: Merge change Iac196e17 into eclair
Merge commit '
1ac56b602aa6a1ac54c608e5a8b76f44638db23b' into eclair-mr2
* commit '
1ac56b602aa6a1ac54c608e5a8b76f44638db23b':
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Mathias Agopian [Wed, 2 Dec 2009 17:47:48 +0000 (09:47 -0800)]
am
33ad0f9e: Merge change I0e44976a into eclair
Merge commit '
33ad0f9ec8d47660b16ced45242a45f369fe2547' into eclair-mr2
* commit '
33ad0f9ec8d47660b16ced45242a45f369fe2547':
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
Android (Google) Code Review [Wed, 2 Dec 2009 16:35:55 +0000 (08:35 -0800)]
Merge change Iae3ed706 into eclair
* changes:
Add new setting for notification light pulsing. Bug #
2238250
Dianne Hackborn [Wed, 2 Dec 2009 13:26:12 +0000 (05:26 -0800)]
am
5886050f: Merge change I0d8f7593 into eclair
Merge commit '
5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-mr2
* commit '
5886050fad97923c33cbc831fe07a5b1746b2b58':
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Ray Chen [Wed, 2 Dec 2009 13:25:43 +0000 (05:25 -0800)]
am
f27eb326: Merge change I0b6ee9fc into eclair
Merge commit '
f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2
* commit '
f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.
Leon Scroggins [Wed, 2 Dec 2009 13:25:12 +0000 (05:25 -0800)]
Android (Google) Code Review [Wed, 2 Dec 2009 10:48:40 +0000 (02:48 -0800)]
Merge change I5ff64f6f into eclair-mr2
* changes:
Add CameraServiceTest.
Android (Google) Code Review [Wed, 2 Dec 2009 06:41:22 +0000 (22:41 -0800)]
Merge change Ic8231560 into eclair
* changes:
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Android (Google) Code Review [Wed, 2 Dec 2009 06:39:33 +0000 (22:39 -0800)]
Merge change Iac196e17 into eclair
* changes:
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Scott Main [Wed, 2 Dec 2009 02:31:19 +0000 (18:31 -0800)]
am
0bd1eeaf: Merge change I21a67b8d into eclair
Merge commit '
0bd1eeaf90d854c487feb8ee35c5c74af28ebc74' into eclair-mr2
* commit '
0bd1eeaf90d854c487feb8ee35c5c74af28ebc74':
docs: remove droid-specific behavior change from platform notes
Jaikumar Ganesh [Wed, 2 Dec 2009 02:30:45 +0000 (18:30 -0800)]
am
a80a75f3: (-s ours) Merge change I5f24a240 into eclair
Merge commit '
a80a75f34a98fe1e41afab93c97aca505939903a' into eclair-mr2
* commit '
a80a75f34a98fe1e41afab93c97aca505939903a':
Register Handsfree profile before headset profile. DO NOT MERGE.
Mike Lockwood [Wed, 2 Dec 2009 02:30:12 +0000 (18:30 -0800)]
am
abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit '
abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-mr2
* commit '
abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
Fix more of bug
2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Android (Google) Code Review [Wed, 2 Dec 2009 02:01:25 +0000 (18:01 -0800)]
Merge change I0e44976a into eclair
* changes:
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
Ken Shirriff [Wed, 2 Dec 2009 01:38:52 +0000 (17:38 -0800)]
Generate a calendar static Java library.
This contains the calendar contract and pim functions for use by the
sync adapter. This library is a duplicate of the functions in the
framework.
Mathias Agopian [Wed, 2 Dec 2009 01:23:28 +0000 (17:23 -0800)]
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
There was bug in the logic that calculated the relative timeout, the start time was
reset each time an event was received, which caused the timeout to never occur if
an application was constantly redrawing.
Now we always check for a timeout when we come back from the waitEvent() and
process the "anti-freeze" if needed, regardless of whether an event was received.
Bai Tao [Wed, 2 Dec 2009 01:16:50 +0000 (17:16 -0800)]
am
90aaaef5: Merge change I0e200c3c into eclair
Merge commit '
90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-mr2
* commit '
90aaaef5f97ee885cc5898f3e7517ad4e5943d2f':
Sending UCS2 encoded SMS correctly
Mathias Agopian [Wed, 2 Dec 2009 01:13:50 +0000 (17:13 -0800)]
am
533a2803: Merge change I18ffb549 into eclair
Merge commit '
533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-mr2
* commit '
533a2803506cc4f196403fdfafd948bd4f8e60d9':
fix [
2069023] STOPSHIP: disable DEBUG_COPYBIT
Mathias Agopian [Wed, 2 Dec 2009 01:10:08 +0000 (17:10 -0800)]
am
8e4a110b: Merge change I5469a4ac into eclair
Merge commit '
8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f' into eclair-mr2
* commit '
8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f':
fixed [
2260070] display stopped updating
Eric Fischer [Wed, 2 Dec 2009 01:08:16 +0000 (17:08 -0800)]
am
926492d9: (-s ours) Merge change Ie8493cf1 into eclair
Merge commit '
926492d9cc51f28f0471352cde77d2d91ae9becd' into eclair-mr2
* commit '
926492d9cc51f28f0471352cde77d2d91ae9becd':
Import revised translations. DO NOT MERGE
Eric Laurent [Wed, 2 Dec 2009 01:04:24 +0000 (17:04 -0800)]
am
bb3bb57a: Merge change I524dc046 into eclair
Merge commit '
bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2
* commit '
bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Android (Google) Code Review [Wed, 2 Dec 2009 00:40:07 +0000 (16:40 -0800)]
Merge change I325e22ca into eclair-mr2
* changes:
Fix a leak in WebView.
Android (Google) Code Review [Tue, 1 Dec 2009 23:57:50 +0000 (15:57 -0800)]
Merge change I0d8f7593 into eclair
* changes:
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Android (Google) Code Review [Tue, 1 Dec 2009 23:42:34 +0000 (15:42 -0800)]
Merge change I8768f2cc into eclair-mr2
* changes:
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
Android (Google) Code Review [Tue, 1 Dec 2009 22:49:23 +0000 (14:49 -0800)]
Merge change I0b6ee9fc into eclair
* changes:
DATE_TAKEN should be in millisecond instead of second.
Android (Google) Code Review [Tue, 1 Dec 2009 22:24:52 +0000 (14:24 -0800)]
Merge change Ib1dd3235 into eclair-mr2
* changes:
fix NPE. don't release an already released compiledSql obj
Android (Google) Code Review [Tue, 1 Dec 2009 20:45:49 +0000 (12:45 -0800)]
Merge change I249345ee into eclair-mr2
* changes:
Add AUTO_CONNECT priority for Headset profile.
Android (Google) Code Review [Tue, 1 Dec 2009 20:26:54 +0000 (12:26 -0800)]
Merge change I42d00fbe into eclair-mr2
* changes:
fix issue with plugin surfaces not updating properly within the view system.
Android (Google) Code Review [Tue, 1 Dec 2009 13:17:44 +0000 (05:17 -0800)]
Merge change Ib16749e2 into eclair-mr2
* changes:
Refactoring the logging interface to remove dependence on NPP.
Eric Laurent [Tue, 1 Dec 2009 10:17:41 +0000 (02:17 -0800)]
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
The problem comes from a deadlock with AudioPolicyService mutex: When the second ringtone starts,
this mutex is locked by AudioPolicyService::startOutput() which in turn calls setParameters() to change the output device.
Audioflinger::ThreadBase::setParameters() signals the parameter change to the AudioFlinger mixer thread and waits for a condition
indicating that the parameter change has been processed.
At the same time, the mixer thread detects that the audio track corresponding to the first ring tone has been killed and calls its destructor.
This calls AudioPolicyService::releaseOutput() which tries to lock the AudioPolicyService mutex.
If this happens before the mixer thread can process the setParameters() command we are deadlocked.
The deadlock ends because setParameters() uses a timeout when waiting for the condition.
This regression was introduced by change 33736 fixing issue
2265163.
The fix consists in calling AudioPolicyService::releaseOutput() from Track::destroy() instead of from Track destructor: as detroy() is never called from the mixer thread loop (as opposed to the destructor) the deadlock described above cannot occur.
Android (Google) Code Review [Tue, 1 Dec 2009 01:38:57 +0000 (17:38 -0800)]
Merge change I21a67b8d into eclair
* changes:
docs: remove droid-specific behavior change from platform notes
Android (Google) Code Review [Tue, 1 Dec 2009 01:00:43 +0000 (17:00 -0800)]
Merge change I5f24a240 into eclair
* changes:
Register Handsfree profile before headset profile. DO NOT MERGE.
Android (Google) Code Review [Tue, 1 Dec 2009 00:39:53 +0000 (16:39 -0800)]
Merge change I2b7c8a32 into eclair
* changes:
Fix more of bug
2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Android (Google) Code Review [Tue, 1 Dec 2009 00:35:43 +0000 (16:35 -0800)]
Merge change I77b4ad0e into eclair-mr2
* changes:
Register Handsfree profile before headset profile.
Android (Google) Code Review [Tue, 1 Dec 2009 00:35:18 +0000 (16:35 -0800)]
Merge change I0e200c3c into eclair
* changes:
Sending UCS2 encoded SMS correctly
Android (Google) Code Review [Tue, 1 Dec 2009 00:23:09 +0000 (16:23 -0800)]
Merge change I305e1b8f into eclair-mr2
* changes:
add --esn option to am to allow adding extra with a null value
Android (Google) Code Review [Mon, 30 Nov 2009 20:13:01 +0000 (12:13 -0800)]
Merge change I18ffb549 into eclair
* changes:
fix [
2069023] STOPSHIP: disable DEBUG_COPYBIT
Mathias Agopian [Mon, 30 Nov 2009 20:10:53 +0000 (12:10 -0800)]
fix [
2069023] STOPSHIP: disable DEBUG_COPYBIT
Android (Google) Code Review [Mon, 30 Nov 2009 19:55:10 +0000 (11:55 -0800)]
Merge change I5469a4ac into eclair
* changes:
fixed [
2260070] display stopped updating
Android (Google) Code Review [Mon, 30 Nov 2009 19:54:46 +0000 (11:54 -0800)]
Merge change Ie8493cf1 into eclair
* changes:
Import revised translations. DO NOT MERGE
Mathias Agopian [Mon, 30 Nov 2009 19:15:41 +0000 (11:15 -0800)]
fixed [
2260070] display stopped updating
always check that the visible region isn't empty after all visible regions are recomputed
clear he freeze-lock if it is.
Android (Google) Code Review [Mon, 30 Nov 2009 18:54:28 +0000 (10:54 -0800)]
Merge change I1c281504 into eclair-mr2
* changes:
Remove some unused window manager methods.
Android (Google) Code Review [Mon, 30 Nov 2009 18:08:58 +0000 (10:08 -0800)]
Merge change I707f53cd into eclair-mr2
* changes:
LightsService cleanup:
Android (Google) Code Review [Mon, 30 Nov 2009 18:00:06 +0000 (10:00 -0800)]
Merge change I524dc046 into eclair
* changes:
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Dima Zavin [Sun, 29 Nov 2009 21:51:14 +0000 (13:51 -0800)]
am
f817218e: dumpstate: Pick up the last kernel log from /proc
Merge commit '
f817218e09a556f20efc81309ba2cdb3475a370b' into eclair-mr2
* commit '
f817218e09a556f20efc81309ba2cdb3475a370b':
dumpstate: Pick up the last kernel log from /proc
Eric Laurent [Fri, 27 Nov 2009 13:07:55 +0000 (05:07 -0800)]
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
Owen Lin [Tue, 24 Nov 2009 08:50:54 +0000 (16:50 +0800)]
Set more camera parameters initial values.
We will need those values for new camera framework. And change the canned jpeg
image to match the new width and height setting.
Change-Id: I49f8fb63d2b859b9e9f1c5d27657a10203315bb6
Android (Google) Code Review [Wed, 25 Nov 2009 23:36:55 +0000 (15:36 -0800)]
Merge change I59214d5d into eclair-mr2
* changes:
Add a new priority for Auto Connection of A2DP.
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.