Commit Graph

7107 Commits

Author SHA1 Message Date
Dianne Hackborn
035c0a704d am dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-plus-aosp

* commit 'dcd58cfda366c915b1f0739cb115f9d972351c73':
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 18:56:21 -08:00
Android (Google) Code Review
a584cbe32f Merge change I7b9328c7 into eclair
* changes:
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 18:51:19 -08:00
Omari Stephens
e7a4c9dd9a am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-plus-aosp

* commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
  Revive backup tests
2009-12-02 18:27:28 -08:00
Android (Google) Code Review
0c285c1294 Merge change Iaa6e73a6 into eclair
* changes:
  Revive backup tests
2009-12-02 18:21:49 -08:00
Mathias Agopian
f198c615ab am 121a31ac: Merge change Id86beb99 into eclair
Merge commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-plus-aosp

* commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:51:44 -08:00
Android (Google) Code Review
91e4152760 Merge change Id86beb99 into eclair
* changes:
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:09:46 -08:00
Mike Lockwood
020c790253 am 9b7dba93: Merge change Icc49422a into eclair
Merge commit '9b7dba936c24fa7959561ddf1a0c8ba4d2165782' into eclair-plus-aosp

* commit '9b7dba936c24fa7959561ddf1a0c8ba4d2165782':
  Implement new notification LED blinking logic:
2009-12-02 16:30:30 -08:00
Android (Google) Code Review
c15de03df8 Merge change Icc49422a into eclair
* changes:
  Implement new notification LED blinking logic:
2009-12-02 16:24:15 -08:00
Dianne Hackborn
4a9969495d am 8693f82d: Merge change If1f0bf33 into eclair
Merge commit '8693f82d02fd9b3a805e076fa1eafacd1737446d' into eclair-plus-aosp

* commit '8693f82d02fd9b3a805e076fa1eafacd1737446d':
  Some work on issue #2286804: sometimes text field doesn't accept input
2009-12-02 16:23:36 -08:00
Mathias Agopian
3e8a81e354 fix [2291418] Camera preview cannot work in Emulator
The image buffer used by glTexImage2d() would be uninitialized when no copybit engine
can be found.
We now always initialize images, since the abscence of copybit is not necessarily fatal.
2009-12-02 16:23:11 -08:00
Android (Google) Code Review
4fb7951251 Merge change If1f0bf33 into eclair
* changes:
  Some work on issue #2286804: sometimes text field doesn't accept input
2009-12-02 16:17:54 -08:00
Jaikumar Ganesh
ca1ef76886 am 59c06278: Merge change I721361f1 into eclair
Merge commit '59c0627841381f47da5cc72e6ff55fa8bad431ed' into eclair-plus-aosp

* commit '59c0627841381f47da5cc72e6ff55fa8bad431ed':
  Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
2009-12-02 16:10:23 -08:00
Android (Google) Code Review
7db8f45d8b Merge change I721361f1 into eclair
* changes:
  Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
2009-12-02 16:02:58 -08:00
Scott Main
e9521cbd15 am 525bfe89: Merge change I9fb53a9c into eclair
Merge commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-plus-aosp

* commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a':
  add screenshots for the Bluetooth Chat sample app
2009-12-02 15:49:27 -08:00
Android (Google) Code Review
574101140a Merge change I9fb53a9c into eclair
* changes:
  add screenshots for the Bluetooth Chat sample app
2009-12-02 15:40:17 -08:00
Eric Fischer
7cd6678624 am 6d5c42ef: Merge change Id0704505 into eclair
Merge commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-plus-aosp

* commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8':
  Import revised translations.  DO NOT MERGE
2009-12-02 15:09:27 -08:00
Android (Google) Code Review
75aa7bddc7 Merge change Id0704505 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-12-02 15:01:35 -08:00
Wink Saville
44f256b5de am cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-plus-aosp

* commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7':
  Cleanup @hide and @deprecated directives.
2009-12-02 11:27:09 -08:00
Amith Yamasani
38464f8476 am a9791d30: Merge change Iae3ed706 into eclair
Merge commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-plus-aosp

* commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc':
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 08:41:31 -08:00
Android (Google) Code Review
7b1451d360 Merge change Iae3ed706 into eclair
* changes:
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 08:35:55 -08:00
Dirk Dougherty
44a8cdd660 am 43810507: Merge change Ic8231560 into eclair
Merge commit '43810507b75cd492e8177ee082e688f87f0ab49c' into eclair-plus-aosp

* commit '43810507b75cd492e8177ee082e688f87f0ab49c':
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-01 22:46:30 -08:00
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