Commit Graph

7236 Commits

Author SHA1 Message Date
Eric Laurent
a2ab52ab19 am 1ac56b60: Merge change Iac196e17 into eclair
Merge commit '1ac56b602aa6a1ac54c608e5a8b76f44638db23b' into eclair-plus-aosp

* commit '1ac56b602aa6a1ac54c608e5a8b76f44638db23b':
  Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
2009-12-01 22:45:42 -08:00
Android (Google) Code Review
63c33bc9c1 Merge change Ic8231560 into eclair
* changes:
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-01 22:41:22 -08:00
Android (Google) Code Review
9e50912d68 Merge change Iac196e17 into eclair
* changes:
  Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
2009-12-01 22:39:33 -08:00
Mathias Agopian
f9251145f7 am 33ad0f9e: Merge change I0e44976a into eclair
Merge commit '33ad0f9ec8d47660b16ced45242a45f369fe2547' into eclair-plus-aosp

* commit '33ad0f9ec8d47660b16ced45242a45f369fe2547':
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
2009-12-01 18:07:19 -08:00
Android (Google) Code Review
516369e34f Merge change I0e44976a into eclair
* changes:
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
2009-12-01 18:01:25 -08:00
Mathias Agopian
0408772e34 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.
2009-12-01 17:23:28 -08:00
Dianne Hackborn
3f7a9d1030 am 5886050f: Merge change I0d8f7593 into eclair
Merge commit '5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-plus-aosp

* commit '5886050fad97923c33cbc831fe07a5b1746b2b58':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-01 17:10:27 -08:00
Ray Chen
1eb86e5205 am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-plus-aosp

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-01 17:08:54 -08:00
Leon Scroggins
d54c26c5dc am db08d5cd: DO NOT MERGE.
Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-plus-aosp

* commit 'db08d5cd441424e4f9621aae7c2414934f781400':
  DO NOT MERGE.
2009-12-01 17:07:13 -08:00
Android (Google) Code Review
f5d9079518 Merge change I0d8f7593 into eclair
* changes:
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-01 15:57:50 -08:00
Android (Google) Code Review
18facb7c4d Merge change I0b6ee9fc into eclair
* changes:
  DATE_TAKEN should be in millisecond instead of second.
2009-12-01 14:49:23 -08:00
Eric Laurent
d3fc8ac6c5 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.
2009-12-01 02:17:41 -08:00
Scott Main
19fa7ec2eb am 0bd1eeaf: Merge change I21a67b8d into eclair
Merge commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74' into eclair-plus-aosp

* commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74':
  docs: remove droid-specific behavior change from platform notes
2009-11-30 17:42:35 -08:00
Android (Google) Code Review
87029dbc46 Merge change I21a67b8d into eclair
* changes:
  docs: remove droid-specific behavior change from platform notes
2009-11-30 17:38:57 -08:00
Jaikumar Ganesh
d5ee5b061b am a80a75f3: Merge change I5f24a240 into eclair
Merge commit 'a80a75f34a98fe1e41afab93c97aca505939903a' into eclair-plus-aosp

* commit 'a80a75f34a98fe1e41afab93c97aca505939903a':
  Register Handsfree profile before headset profile. DO NOT MERGE.
2009-11-30 17:07:08 -08:00
Android (Google) Code Review
6a44e6c08f Merge change I5f24a240 into eclair
* changes:
  Register Handsfree profile before headset profile. DO NOT MERGE.
2009-11-30 17:00:43 -08:00
Mike Lockwood
73463fafdb am abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-plus-aosp

* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-11-30 16:47:18 -08:00
Bai Tao
9808760214 am 90aaaef5: Merge change I0e200c3c into eclair
Merge commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-plus-aosp

* commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f':
  Sending UCS2 encoded SMS correctly
2009-11-30 16:41:51 -08:00
Android (Google) Code Review
59eceed3cf Merge change I2b7c8a32 into eclair
* changes:
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-11-30 16:39:53 -08:00
Android (Google) Code Review
b0f0d44672 Merge change I0e200c3c into eclair
* changes:
  Sending UCS2 encoded SMS correctly
2009-11-30 16:35:18 -08:00
Mathias Agopian
f9f36b5ecd am 533a2803: Merge change I18ffb549 into eclair
Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-plus-aosp

* commit '533a2803506cc4f196403fdfafd948bd4f8e60d9':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-11-30 12:17:52 -08:00
Android (Google) Code Review
7462be0240 Merge change I18ffb549 into eclair
* changes:
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-11-30 12:13:01 -08:00
Mathias Agopian
f74573486d fix [2069023] STOPSHIP: disable DEBUG_COPYBIT 2009-11-30 12:10:53 -08:00
Mathias Agopian
f5e3830fb0 am 8e4a110b: Merge change I5469a4ac into eclair
Merge commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f' into eclair-plus-aosp

* commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f':
  fixed [2260070] display stopped updating
2009-11-30 12:00:53 -08:00
Eric Fischer
a0b4d6a06e am 926492d9: Merge change Ie8493cf1 into eclair
Merge commit '926492d9cc51f28f0471352cde77d2d91ae9becd' into eclair-plus-aosp

* commit '926492d9cc51f28f0471352cde77d2d91ae9becd':
  Import revised translations.  DO NOT MERGE
2009-11-30 12:00:21 -08:00
Android (Google) Code Review
2688bf49c4 Merge change I5469a4ac into eclair
* changes:
  fixed [2260070] display stopped updating
2009-11-30 11:55:10 -08:00
Android (Google) Code Review
067be1dd47 Merge change Ie8493cf1 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-30 11:54:46 -08:00
Mathias Agopian
c61de17f14 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.
2009-11-30 11:15:41 -08:00
Eric Laurent
8eaa6313a5 am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-plus-aosp

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-11-30 10:05:52 -08:00
Android (Google) Code Review
def563c451 Merge change I524dc046 into eclair
* changes:
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-11-30 10:00:06 -08:00
Dima Zavin
203fe87ef9 am f817218e: dumpstate: Pick up the last kernel log from /proc
Merge commit 'f817218e09a556f20efc81309ba2cdb3475a370b' into eclair-plus-aosp

* commit 'f817218e09a556f20efc81309ba2cdb3475a370b':
  dumpstate: Pick up the last kernel log from /proc
2009-11-29 13:50:27 -08:00
Eric Laurent
059b413e65 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.
2009-11-27 05:07:55 -08:00
Joe Onorato
661f30a30e am bcab01f6: Merge change Ic9f6bf94 into eclair
Merge commit 'bcab01f6d0158c4d928f42b034949dc9608665a6' into eclair-plus-aosp

* commit 'bcab01f6d0158c4d928f42b034949dc9608665a6':
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:58:28 -08:00
Android (Google) Code Review
8f80ef1135 Merge change Ic9f6bf94 into eclair
* changes:
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:52:08 -08:00
Jack Palevich
66f81abeed am ca00dee2: Merge change I5aa3adcf into eclair
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-plus-aosp

* commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5':
  Improve the exception message text by including eglGetError().
2009-11-25 13:48:54 -08:00
Android (Google) Code Review
579c593593 Merge change I5aa3adcf into eclair
* changes:
  Improve the exception message text by including eglGetError().
2009-11-25 13:43:07 -08:00
Dianne Hackborn
daf0406bbb am 8e1985d4: Merge change Ie552036f into eclair
Merge commit '8e1985d4f28bfa9bea7db05f324759991d4e59e9' into eclair-plus-aosp

* commit '8e1985d4f28bfa9bea7db05f324759991d4e59e9':
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 13:03:39 -08:00
Brett Chabot
458de773bd am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-plus-aosp

* commit 'd782b4b6f3411ece7299f414783baa3758756bbe':
  Add keyguard permission to instrumented ImfTest package.
2009-11-25 13:02:50 -08:00
Android (Google) Code Review
ed1f111364 Merge change Ie552036f into eclair
* changes:
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 12:55:44 -08:00
Ben Murdoch
f0a8ffa5b4 am 7f7c16de: Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-plus-aosp

* 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.
2009-11-25 02:43:47 -08:00
Android (Google) Code Review
e57a2362fd 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.
2009-11-25 02:37:27 -08:00
Joe Onorato
b7036642a7 am 55896f3c: Merge change Ib71193bf into eclair
Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-plus-aosp

* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
2009-11-24 15:45:50 -08:00
Android (Google) Code Review
7af6912009 Merge change Ib71193bf into eclair
* changes:
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
2009-11-24 15:41:32 -08:00
Dianne Hackborn
2e8866913a am 118d92f7: Merge change I16925b91 into eclair
Merge commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b' into eclair-plus-aosp

* commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b':
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 14:51:37 -08:00
Android (Google) Code Review
8b967d2fab Merge change I16925b91 into eclair
* changes:
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 14:43:53 -08:00
Mathias Agopian
d67728cff1 am 63851404: Merge change Ibf0c320a into eclair
Merge commit '638514048141bf9f28a4bede77b83c3238f5c194' into eclair-plus-aosp

* commit '638514048141bf9f28a4bede77b83c3238f5c194':
  When using MDP, we needed to use a texture for diming.
2009-11-24 14:43:40 -08:00
Android (Google) Code Review
6d0e906926 Merge change Ibf0c320a into eclair
* changes:
  When using MDP, we needed to use a texture for diming.
2009-11-24 14:26:28 -08:00
Jim Miller
2ee0f6950d am 35cdb484: Merge change I6c6c166b into eclair
Merge commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4' into eclair-plus-aosp

* commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4':
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:05:16 -08:00
Android (Google) Code Review
978f4e5b07 Merge change I6c6c166b into eclair
* changes:
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:00:54 -08:00
Swarna Kumar
8e59864335 am 7f8e3409: Merge change I816428ae into eclair
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-plus-aosp

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
2009-11-24 13:32:43 -08:00