OSDN Git Service
Cary Clark [Fri, 6 Nov 2009 19:36:07 +0000 (11:36 -0800)]
am
ca3a6dc4: am
45011f2d: (-s ours) Merge change I4e9fe62b into eclair
Merge commit '
ca3a6dc41418da152d154245c59054f7d0f0d679' into eclair-mr2-plus-aosp
* commit '
ca3a6dc41418da152d154245c59054f7d0f0d679':
do not merge -- original checkin to mr2 here:
Andreas Huber [Fri, 6 Nov 2009 19:35:57 +0000 (11:35 -0800)]
am
f28e0c2a: Merge change I9a50fdf4 into eclair-mr2
Merge commit '
f28e0c2ac75bf630a595d442a7ddefcc1f8386f6' into eclair-mr2-plus-aosp
* commit '
f28e0c2ac75bf630a595d442a7ddefcc1f8386f6':
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
Ken Shirriff [Fri, 6 Nov 2009 19:35:42 +0000 (11:35 -0800)]
am
300160ed: Merge change I29a3be5b into eclair-mr2
Merge commit '
300160edc936f2b8265900101136068e3912ff33' into eclair-mr2-plus-aosp
* commit '
300160edc936f2b8265900101136068e3912ff33':
Calendar: add CALLER_IS_SYNCADAPTER parameter.
Cary Clark [Fri, 6 Nov 2009 19:29:40 +0000 (11:29 -0800)]
am
45011f2d: (-s ours) Merge change I4e9fe62b into eclair
Merge commit '
45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-mr2
* commit '
45011f2dc56e99c00bd1f3abff4f11d6df644d80':
do not merge -- original checkin to mr2 here:
Android (Google) Code Review [Fri, 6 Nov 2009 19:25:26 +0000 (14:25 -0500)]
Merge change I9a50fdf4 into eclair-mr2
* changes:
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
Android (Google) Code Review [Fri, 6 Nov 2009 19:23:14 +0000 (14:23 -0500)]
Merge change I4e9fe62b into eclair
* changes:
do not merge -- original checkin to mr2 here:
Android (Google) Code Review [Fri, 6 Nov 2009 18:23:27 +0000 (13:23 -0500)]
Merge change I29a3be5b into eclair-mr2
* changes:
Calendar: add CALLER_IS_SYNCADAPTER parameter.
Xavier Ducrohet [Fri, 6 Nov 2009 18:17:45 +0000 (10:17 -0800)]
am
bef17491: am
9eaff61a: am
91bb62f0: New API 4 with new CDMA constants.
Merge commit '
bef17491488a297c8f6587bd37e333cbb8cf0ce4' into eclair-mr2-plus-aosp
* commit '
bef17491488a297c8f6587bd37e333cbb8cf0ce4':
New API 4 with new CDMA constants.
Andreas Huber [Fri, 6 Nov 2009 18:17:35 +0000 (10:17 -0800)]
am
be364022: am
fde273ba: Merge change Ic997acac into eclair
Merge commit '
be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5' into eclair-mr2-plus-aosp
* commit '
be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Jared Suttles [Fri, 6 Nov 2009 18:17:26 +0000 (10:17 -0800)]
am
1ae7831b: am
8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit '
1ae7831b8a90a9c0c614790027ce88d5fe75cf93' into eclair-mr2-plus-aosp
* commit '
1ae7831b8a90a9c0c614790027ce88d5fe75cf93':
jni: GpsLocationProvider: Check for pending callbacks before waiting
Mike Lockwood [Fri, 6 Nov 2009 18:17:14 +0000 (10:17 -0800)]
am
0cb3f587: am
0d72f7e9: Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '
0cb3f58741efa2b2b7477cbae973a29e614c62e8' into eclair-mr2-plus-aosp
* commit '
0cb3f58741efa2b2b7477cbae973a29e614c62e8':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Xavier Ducrohet [Fri, 6 Nov 2009 18:08:03 +0000 (10:08 -0800)]
am
9eaff61a: am
91bb62f0: New API 4 with new CDMA constants.
Merge commit '
9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-mr2
* commit '
9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed':
New API 4 with new CDMA constants.
Andreas Huber [Fri, 6 Nov 2009 18:07:53 +0000 (10:07 -0800)]
am
fde273ba: Merge change Ic997acac into eclair
Merge commit '
fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2
* commit '
fde273baf6592a5fde15ee4dd4d798d90368e440':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Xavier Ducrohet [Fri, 6 Nov 2009 18:00:29 +0000 (10:00 -0800)]
am
91bb62f0: New API 4 with new CDMA constants.
Merge commit '
91bb62f0dc002065cb1932a96fecf15c1b92b6e9' into eclair
* commit '
91bb62f0dc002065cb1932a96fecf15c1b92b6e9':
New API 4 with new CDMA constants.
Andreas Huber [Fri, 6 Nov 2009 16:40:09 +0000 (08:40 -0800)]
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
Android (Google) Code Review [Fri, 6 Nov 2009 16:27:03 +0000 (11:27 -0500)]
Merge change Ic997acac into eclair
* changes:
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Cary Clark [Thu, 15 Oct 2009 19:29:08 +0000 (15:29 -0400)]
do not merge -- original checkin to mr2 here:
https://android-git.corp.google.com/g/#change,30204
check for native initialization before calling public function
Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.
These cases can be triggered by the monkey.
Fixes http://b/issue?id=
2187719
Jared Suttles [Fri, 6 Nov 2009 14:31:37 +0000 (06:31 -0800)]
am
8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit '
8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-mr2
* commit '
8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f':
jni: GpsLocationProvider: Check for pending callbacks before waiting
Mike Lockwood [Fri, 6 Nov 2009 13:35:04 +0000 (05:35 -0800)]
am
0d72f7e9: Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '
0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-mr2
* commit '
0d72f7e9fc0d6f774eda5758d111bec5608bcf42':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Jared Suttles [Wed, 4 Nov 2009 22:53:44 +0000 (16:53 -0600)]
jni: GpsLocationProvider: Check for pending callbacks before waiting
This change fixes a corner case where a callback may not get handled until
a second callback arrives. This can happen because there is a significant
section of the wait_for_event function where the mutex is not locked, and
the sPendingCallbacks member could be updated. We now check to see if
there is a pending callback to handle before we wait for another callback.
Change-Id: I20cfae1e780944bb74133940dda032efc4c55540
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Fri, 6 Nov 2009 01:53:00 +0000 (20:53 -0500)]
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
This should fix a "black screen" bug that Motorola identified.
mProximitySensorActive was being set to true due to a proximity sensor change being posted
just after we disabled the proximity sensor.
Now we ignore proximity changes after the phone app releases the proximity lock after the call is done.
Change-Id: I417d423de3d43515389b1b7b008cdcb795cd10f6
Signed-off-by: Mike Lockwood <lockwood@android.com>
jsh [Fri, 6 Nov 2009 08:30:49 +0000 (00:30 -0800)]
am
9e63ce81: am
092f0341: Merge change I44d4cbec into eclair
Merge commit '
9e63ce81c5e870a058752974286f21d566d092db' into eclair-mr2-plus-aosp
* commit '
9e63ce81c5e870a058752974286f21d566d092db':
Fix some SMS encode issues.
Suchi Amalapurapu [Fri, 6 Nov 2009 08:30:40 +0000 (00:30 -0800)]
am
750e82e5: am
bf50200b: Merge change Ic9568e39 into eclair
Merge commit '
750e82e51921428dc4ad9a75f18b02b8048734d8' into eclair-mr2-plus-aosp
* commit '
750e82e51921428dc4ad9a75f18b02b8048734d8':
When tasks are moved to top or bottom, the app tokens are being rearranged.
Jack Palevich [Fri, 6 Nov 2009 08:25:44 +0000 (00:25 -0800)]
am
79447b20: resolved conflicts for merge of
84872738 to eclair-mr2
Merge commit '
79447b2087c8c820d742185dda7305101f9656f0' into eclair-mr2-plus-aosp
* commit '
79447b2087c8c820d742185dda7305101f9656f0':
Improve GLSurfaceView to avoid deadlocks and race conditions.
jsh [Fri, 6 Nov 2009 08:23:13 +0000 (00:23 -0800)]
am
092f0341: Merge change I44d4cbec into eclair
Merge commit '
092f03418a4988e4da706dca27128327b5a5fc55' into eclair-mr2
* commit '
092f03418a4988e4da706dca27128327b5a5fc55':
Fix some SMS encode issues.
Suchi Amalapurapu [Fri, 6 Nov 2009 08:23:03 +0000 (00:23 -0800)]
am
bf50200b: Merge change Ic9568e39 into eclair
Merge commit '
bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-mr2
* commit '
bf50200ba494db0ac2ce655a95f76640f49355ee':
When tasks are moved to top or bottom, the app tokens are being rearranged.
Jack Palevich [Fri, 6 Nov 2009 08:13:38 +0000 (00:13 -0800)]
resolved conflicts for merge of
84872738 to eclair-mr2
Android (Google) Code Review [Fri, 6 Nov 2009 08:07:01 +0000 (03:07 -0500)]
Merge change I44d4cbec into eclair
* changes:
Fix some SMS encode issues.
jsh [Fri, 6 Nov 2009 01:00:15 +0000 (17:00 -0800)]
Fix some SMS encode issues.
1. Spanish SMS 71-160 chars not sent. This was because calculateLength
allowed for single-segment EMS encoding, while encodeUserDataPayload
did not. For now, change calculateLength to match encodeUserDataPayload
(ie, fallback to UTF16 in this case). (b/
2224849)
2. Unicode value of N w/tilde was incorrect. (b/
2224849)
3. Add '\' and '/' to the list of valid separators in CDMA SMS numeric
addresses. (b/
2236527)
Android (Google) Code Review [Fri, 6 Nov 2009 07:12:40 +0000 (02:12 -0500)]
Merge change Ic9568e39 into eclair
* changes:
When tasks are moved to top or bottom, the app tokens are being rearranged. The window token rearrangement is defered if an animation is underway. Force a focus recomputation when the window tokens are finally rearranged so that we have a valid focused window.
Android (Google) Code Review [Fri, 6 Nov 2009 06:23:52 +0000 (01:23 -0500)]
Merge change I971f6fd3 into eclair
* changes:
Improve GLSurfaceView to avoid deadlocks and race conditions.
Dianne Hackborn [Fri, 6 Nov 2009 06:02:56 +0000 (22:02 -0800)]
am
892574f5: am
13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '
892574f5f91b834f70ace880301db61f60d58362' into eclair-mr2-plus-aosp
* commit '
892574f5f91b834f70ace880301db61f60d58362':
Fix SDK build: a few things missing, a link that was wrong.
Dianne Hackborn [Fri, 6 Nov 2009 05:57:51 +0000 (21:57 -0800)]
am
13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '
13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-mr2
* commit '
13bf8260134d516cbcc982d360d9f21067f47fa6':
Fix SDK build: a few things missing, a link that was wrong.
Dianne Hackborn [Fri, 6 Nov 2009 05:45:51 +0000 (21:45 -0800)]
Fix SDK build: a few things missing, a link that was wrong.
Change-Id: I55c9c510b3f0866ce6085927afa00b9fb69dd8c5
Dianne Hackborn [Fri, 6 Nov 2009 04:49:22 +0000 (20:49 -0800)]
am
237cc15c: am
274b120f: Fix issue #
2243096: Need to expose live wallpaper APIs in SDK
Merge commit '
237cc15c171511e8c8ffe903c5d6f473593477b8' into eclair-mr2-plus-aosp
* commit '
237cc15c171511e8c8ffe903c5d6f473593477b8':
Fix issue #
2243096: Need to expose live wallpaper APIs in SDK
Dianne Hackborn [Fri, 6 Nov 2009 04:41:50 +0000 (20:41 -0800)]
am
274b120f: Fix issue #
2243096: Need to expose live wallpaper APIs in SDK
Merge commit '
274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-mr2
* commit '
274b120f3975c8db6daeeab51a5fe08d6dede479':
Fix issue #
2243096: Need to expose live wallpaper APIs in SDK
Joe Onorato [Fri, 6 Nov 2009 04:37:38 +0000 (20:37 -0800)]
am
c92196f6: am
c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit '
c92196f6932571ddd8b353dd9c9bb37245e3e2de' into eclair-mr2-plus-aosp
* commit '
c92196f6932571ddd8b353dd9c9bb37245e3e2de':
Another test for StatusBar test.
Romain Guy [Fri, 6 Nov 2009 04:37:29 +0000 (20:37 -0800)]
Mike Lockwood [Fri, 6 Nov 2009 04:37:20 +0000 (20:37 -0800)]
am
b31174de: am
9ce3df55: Merge change I2c6e54e4 into eclair
Merge commit '
b31174de6a3d5ba39ccea02c9b653ea4f950bb89' into eclair-mr2-plus-aosp
* commit '
b31174de6a3d5ba39ccea02c9b653ea4f950bb89':
Throttle proximity sensor values so we do not process more than one change a second.
Dianne Hackborn [Fri, 6 Nov 2009 01:52:19 +0000 (17:52 -0800)]
Fix issue #
2243096: Need to expose live wallpaper APIs in SDK
Change-Id: I7e996bf549922c1bb8e8c00d051650ffe12d818c
Joe Onorato [Fri, 6 Nov 2009 04:28:10 +0000 (20:28 -0800)]
am
c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit '
c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-mr2
* commit '
c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
Another test for StatusBar test.
Romain Guy [Fri, 6 Nov 2009 04:27:53 +0000 (20:27 -0800)]
Mike Lockwood [Fri, 6 Nov 2009 04:26:44 +0000 (20:26 -0800)]
am
9ce3df55: Merge change I2c6e54e4 into eclair
Merge commit '
9ce3df55bab12bea563faf764f7beb3555d5942c' into eclair-mr2
* commit '
9ce3df55bab12bea563faf764f7beb3555d5942c':
Throttle proximity sensor values so we do not process more than one change a second.
Wei-Ta Chen [Fri, 6 Nov 2009 04:12:50 +0000 (20:12 -0800)]
am
d512a3b3: Merge change Ic1d72f56 into eclair-mr2
Merge commit '
d512a3b3a8d0adb37bd0208181a02c91dc8025fb' into eclair-mr2-plus-aosp
* commit '
d512a3b3a8d0adb37bd0208181a02c91dc8025fb':
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
Android (Google) Code Review [Fri, 6 Nov 2009 04:07:33 +0000 (23:07 -0500)]
Merge change Ic1d72f56 into eclair-mr2
* changes:
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif to from the full image, if both can generate of a thumbnail of same size.
Wei-Ta Chen [Fri, 6 Nov 2009 03:56:52 +0000 (11:56 +0800)]
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
to from the full image, if both can generate of a thumbnail of same size.
Wink Saville [Fri, 6 Nov 2009 03:21:47 +0000 (19:21 -0800)]
am
e14861ea: am
09263e1b: Merge change Id0267cc0 into eclair
Merge commit '
e14861eaa7e01e28e1f5a8dc9c10924400ac2cb7' into eclair-mr2-plus-aosp
* commit '
e14861eaa7e01e28e1f5a8dc9c10924400ac2cb7':
Add needsOtaServiceProvisioning and used to not allow
James Dong [Fri, 6 Nov 2009 03:21:38 +0000 (19:21 -0800)]
am
99588d59: am
1e495da1: Merge change I4b03c2cd into eclair
Merge commit '
99588d590f0965beb899606a79db0889601c7ec0' into eclair-mr2-plus-aosp
* commit '
99588d590f0965beb899606a79db0889601c7ec0':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Jean-Michel Trivi [Fri, 6 Nov 2009 03:21:27 +0000 (19:21 -0800)]
am
571529f8: am
d94ed379: Merge change I1dc2ae28 into eclair
Merge commit '
571529f82159a3205547a61d1b720b695dc066be' into eclair-mr2-plus-aosp
* commit '
571529f82159a3205547a61d1b720b695dc066be':
Fix bug
2242585 to unhide the new audio recording sources.
Android (Google) Code Review [Fri, 6 Nov 2009 03:20:02 +0000 (22:20 -0500)]
Merge change Ie71d9e42 into eclair
* changes:
Another test for StatusBar test.
Suchi Amalapurapu [Fri, 6 Nov 2009 02:51:16 +0000 (18:51 -0800)]
When tasks are moved to top or bottom, the app tokens are being rearranged.
The window token rearrangement is defered if an animation is
underway. Force a focus recomputation when the window tokens are finally
rearranged so that we have a valid focused window.
Wink Saville [Fri, 6 Nov 2009 03:10:43 +0000 (19:10 -0800)]
am
09263e1b: Merge change Id0267cc0 into eclair
Merge commit '
09263e1bc0f8f783b24b92643d4ccda87966d01f' into eclair-mr2
* commit '
09263e1bc0f8f783b24b92643d4ccda87966d01f':
Add needsOtaServiceProvisioning and used to not allow
James Dong [Fri, 6 Nov 2009 03:09:58 +0000 (19:09 -0800)]
am
1e495da1: Merge change I4b03c2cd into eclair
Merge commit '
1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-mr2
* commit '
1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Romain Guy [Fri, 6 Nov 2009 02:44:12 +0000 (18:44 -0800)]
Fix the build
Change-Id: Id7514858594772ab79c0f3db745b00f0bb59218b
Jack Palevich [Fri, 6 Nov 2009 02:21:46 +0000 (10:21 +0800)]
Improve GLSurfaceView to avoid deadlocks and race conditions.
This is work towards fixing bug
2228262
Specific issues fixed by this change:
+ GLThread names now include the thread id, making it easier to tell one
GLThread from another.
+ A private final static boolean LOG_THREADS can be set to true at compile
time to print out thread-related trace information, helpful for debugging
GLSurfaceView behavior. This static defaults to "false".
+ Changed calls to "notify" to "notifyAll" to make the code more
robust in case more than two threads are blocked on the same monitor.
+ Add a GLThreadManager to help manage the transition to
a new GLThread. Currently only one GLThread can be active in an address
space. When the second thread starts up, the GLThreadManager helps the old
GLThread to shut down,
+ Make sure we stop waiting for dead GLThreads. This is done by adding
checks for a variable mDone being true to our monitor wait loops. And
we use a "finally" clause at the end of GLThread.run() method to set mDone
and notifyAll any wait loops.
Android (Google) Code Review [Fri, 6 Nov 2009 01:29:54 +0000 (20:29 -0500)]
Merge change I2c6e54e4 into eclair
* changes:
Throttle proximity sensor values so we do not process more than one change a second.
Andreas Huber [Fri, 6 Nov 2009 00:34:39 +0000 (16:34 -0800)]
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Android (Google) Code Review [Fri, 6 Nov 2009 00:25:11 +0000 (19:25 -0500)]
Merge change Id0267cc0 into eclair
* changes:
Add needsOtaServiceProvisioning and used to not allow data calls until the device is provisioned.
Android (Google) Code Review [Fri, 6 Nov 2009 00:15:56 +0000 (19:15 -0500)]
Merge change I4b03c2cd into eclair
* changes:
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Jean-Michel Trivi [Fri, 6 Nov 2009 00:10:32 +0000 (16:10 -0800)]
am
d94ed379: Merge change I1dc2ae28 into eclair
Merge commit '
d94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-mr2
* commit '
d94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug
2242585 to unhide the new audio recording sources.
Android (Google) Code Review [Fri, 6 Nov 2009 00:03:09 +0000 (19:03 -0500)]
Merge change I1dc2ae28 into eclair
* changes:
Fix bug
2242585 to unhide the new audio recording sources. Unhide CAMCORDER and VOICE_RECOGNITION in android.media.MediaRecorder
Romain Guy [Thu, 5 Nov 2009 23:57:49 +0000 (15:57 -0800)]
am
8426319c: am
f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit '
8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp
* commit '
8426319c5a5f4b6b7a1d5940e78d3fc717c36d98':
Prevent crash in Home when using widgets whose ids collide with Home's
Guang Zhu [Thu, 5 Nov 2009 23:57:38 +0000 (15:57 -0800)]
am
1c7be08f: am
bfa68abc: layout test rebase, bug fix
Merge commit '
1c7be08f6bc22d3718fd8bc9f9f5a0426ba17a77' into eclair-mr2-plus-aosp
* commit '
1c7be08f6bc22d3718fd8bc9f9f5a0426ba17a77':
layout test rebase, bug fix
Jason Sams [Thu, 5 Nov 2009 23:50:23 +0000 (15:50 -0800)]
am
a8f2c2b4: am
902051df: Merge change I0e27b5ca into eclair
Merge commit '
a8f2c2b428f5f261c7c95b6b19404b05f0b30762' into eclair-mr2-plus-aosp
* commit '
a8f2c2b428f5f261c7c95b6b19404b05f0b30762':
Fix texture upload bug for narrow texture of less than 32bpp.
Jaikumar Ganesh [Thu, 5 Nov 2009 23:50:11 +0000 (15:50 -0800)]
am
f53f86a7: am
8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit '
f53f86a743a91b4383e480dcf44a8e7b16ca7fa0' into eclair-mr2-plus-aosp
* commit '
f53f86a743a91b4383e480dcf44a8e7b16ca7fa0':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Jean-Michel Trivi [Thu, 5 Nov 2009 23:49:37 +0000 (15:49 -0800)]
Fix bug
2242585 to unhide the new audio recording sources.
Unhide CAMCORDER and VOICE_RECOGNITION in android.media.MediaRecorder
Romain Guy [Thu, 5 Nov 2009 23:47:43 +0000 (15:47 -0800)]
am
f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit '
f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2
* commit '
f20e9a88a36ced533e96b8873a3321b4d51585ca':
Prevent crash in Home when using widgets whose ids collide with Home's
Guang Zhu [Thu, 5 Nov 2009 23:47:32 +0000 (15:47 -0800)]
am
bfa68abc: layout test rebase, bug fix
Merge commit '
bfa68abc955ed1fe6cf6d98e42f344a8d623fab7' into eclair-mr2
* commit '
bfa68abc955ed1fe6cf6d98e42f344a8d623fab7':
layout test rebase, bug fix
Android (Google) Code Review [Thu, 5 Nov 2009 23:42:14 +0000 (18:42 -0500)]
Merge change Idf40f3b0 into eclair
* changes:
Prevent crash in Home when using widgets whose ids collide with Home's resources.
Romain Guy [Thu, 5 Nov 2009 21:36:15 +0000 (13:36 -0800)]
Prevent crash in Home when using widgets whose ids collide with Home's
resources.
Bug #
2228943.
Approved by mcleron, triaged by ryanpc.
Change-Id: Idf40f3b09502ae5d0d3b9a6a72c265a2de2ffca2
Jason Sams [Thu, 5 Nov 2009 23:39:51 +0000 (15:39 -0800)]
am
902051df: Merge change I0e27b5ca into eclair
Merge commit '
902051dfa7590f8b2c22eb0a46df80f1bf19a087' into eclair-mr2
* commit '
902051dfa7590f8b2c22eb0a46df80f1bf19a087':
Fix texture upload bug for narrow texture of less than 32bpp.
Jaikumar Ganesh [Thu, 5 Nov 2009 23:39:40 +0000 (15:39 -0800)]
am
8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit '
8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2
* commit '
8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Guang Zhu [Thu, 5 Nov 2009 23:24:10 +0000 (15:24 -0800)]
layout test rebase, bug fix
* rebase layout test based on newly enabled http tests
* fix a bug in initializing parameters (should happen before super.onCreate)
Ken Shirriff [Fri, 23 Oct 2009 16:50:41 +0000 (09:50 -0700)]
Calendar: add CALLER_IS_SYNCADAPTER parameter.
Android (Google) Code Review [Thu, 5 Nov 2009 22:39:56 +0000 (17:39 -0500)]
Merge change I0e27b5ca into eclair
* changes:
Fix texture upload bug for narrow texture of less than 32bpp.
Android (Google) Code Review [Thu, 5 Nov 2009 22:15:51 +0000 (17:15 -0500)]
Merge change I21d0dca3 into eclair
* changes:
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Joe Onorato [Thu, 5 Nov 2009 22:12:18 +0000 (17:12 -0500)]
Another test for StatusBar test.
Andreas Huber [Thu, 5 Nov 2009 22:05:47 +0000 (14:05 -0800)]
am
e334ce27: am
05eca1d4: (-s ours) Merge change Ie80e2381 into eclair
Merge commit '
e334ce27f1c936af54748c1312cfdeeb3eea7184' into eclair-mr2-plus-aosp
* commit '
e334ce27f1c936af54748c1312cfdeeb3eea7184':
DO NOT MERGE: Squashed commit of the following:
Amith Yamasani [Thu, 5 Nov 2009 22:05:38 +0000 (14:05 -0800)]
am
7b2aa74f: am
4ab2c777: Merge change I14fb81af into eclair
Merge commit '
7b2aa74f4644979acea456e1047c96e17e09bc6d' into eclair-mr2-plus-aosp
* commit '
7b2aa74f4644979acea456e1047c96e17e09bc6d':
Fix for
2221718: Hang in BatteryStatsService.noteBluetoothOn
Andreas Huber [Thu, 5 Nov 2009 22:05:29 +0000 (14:05 -0800)]
am
2fe3e3a7: am
818a9cf8: Merge change Ia4eedace into eclair
Merge commit '
2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6' into eclair-mr2-plus-aosp
* commit '
2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6':
Now that UseBuffer on this component is fixed, let's use it.
Daniel Sandler [Thu, 5 Nov 2009 22:05:19 +0000 (14:05 -0800)]
am
1bca7612: am
eca41b31: Merge change Id1458b01 into eclair
Merge commit '
1bca7612dfeb78bba91f3985fb6f3567daf13a57' into eclair-mr2-plus-aosp
* commit '
1bca7612dfeb78bba91f3985fb6f3567daf13a57':
New live wallpaper API to expose author and description strings.
Fred Quintana [Thu, 5 Nov 2009 22:01:44 +0000 (14:01 -0800)]
am
3266c5f1: resolved conflicts for merge of
f476c480 to eclair-mr2
Merge commit '
3266c5f125be34aae0f50e0e3397b14d9a603ad0' into eclair-mr2-plus-aosp
* commit '
3266c5f125be34aae0f50e0e3397b14d9a603ad0':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Andreas Huber [Thu, 5 Nov 2009 21:59:20 +0000 (13:59 -0800)]
am
05eca1d4: (-s ours) Merge change Ie80e2381 into eclair
Merge commit '
05eca1d46a45723a57899dabad698537b7faef82' into eclair-mr2
* commit '
05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
Amith Yamasani [Thu, 5 Nov 2009 21:55:33 +0000 (13:55 -0800)]
am
4ab2c777: Merge change I14fb81af into eclair
Merge commit '
4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-mr2
* commit '
4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
Fix for
2221718: Hang in BatteryStatsService.noteBluetoothOn
Andreas Huber [Thu, 5 Nov 2009 21:55:19 +0000 (13:55 -0800)]
am
818a9cf8: Merge change Ia4eedace into eclair
Merge commit '
818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-mr2
* commit '
818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
Daniel Sandler [Thu, 5 Nov 2009 21:54:40 +0000 (13:54 -0800)]
am
eca41b31: Merge change Id1458b01 into eclair
Merge commit '
eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2
* commit '
eca41b31fb9a5202f755bfd9dbc4849dbb486137':
New live wallpaper API to expose author and description strings.
Android (Google) Code Review [Thu, 5 Nov 2009 21:50:34 +0000 (16:50 -0500)]
Merge change Ie80e2381 into eclair
* changes:
DO NOT MERGE: Squashed commit of the following:
Mike Lockwood [Thu, 5 Nov 2009 21:08:51 +0000 (16:08 -0500)]
Throttle proximity sensor values so we do not process more than one change a second.
This is to prevent a noisy proximity sensor from causing the screen to turn on and off
in rapid succession, which can trigger race conditions in the keyguard manager.
Change-Id: I2c6e54e4b41716e038854ed9a827c901579c8865
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Thu, 5 Nov 2009 21:08:40 +0000 (16:08 -0500)]
Merge change I14fb81af into eclair
* changes:
Fix for
2221718: Hang in BatteryStatsService.noteBluetoothOn
Andreas Huber [Thu, 5 Nov 2009 20:04:22 +0000 (12:04 -0800)]
DO NOT MERGE: Squashed commit of the following:
commit
08259dd3dc9026887f9bbfedaf45866eb56ea9bc
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 12:02:31 2009 -0800
DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback.
commit
991832fe4dc012e51d3d9ed8d647c7f09991858f
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:24:11 2009 -0800
DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though.
commit
cec45cf302d9218fe79956cbe8a462d7ca3a10bb
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 16:11:54 2009 -0700
DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
commit
34a1e885ef9113d68acbc26d36fcc47fdebbed84
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:10:49 2009 -0800
DO NOT MERGE: Fix heap corruptin in OMXNodeInstance.
commit
5a47f7439a1298b330541a7e4e647a8b44487388
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:08:19 2009 -0800
DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec.
commit
45bed64722501b9f411a2940aff5aff4cc4d2e98
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:02:23 2009 -0800
DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts.
commit
6738e306a50196f31a73d4fc7b7c45faff639903
Author: Andreas Huber <andih@google.com>
Date: Thu Oct 15 13:46:54 2009 -0700
DO NOT MERGE: Reimplement the OMX backend for stagefright.
Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.
Changed APIs to conform to the rest of the system.
Android (Google) Code Review [Thu, 5 Nov 2009 21:01:50 +0000 (16:01 -0500)]
Merge change Ia4eedace into eclair
* changes:
Now that UseBuffer on this component is fixed, let's use it.
Android (Google) Code Review [Thu, 5 Nov 2009 20:53:25 +0000 (15:53 -0500)]
Merge change Id1458b01 into eclair
* changes:
New live wallpaper API to expose author and description strings.
Jason Sams [Thu, 5 Nov 2009 20:44:58 +0000 (12:44 -0800)]
Fix texture upload bug for narrow texture of less than 32bpp.
Xavier Ducrohet [Wed, 4 Nov 2009 02:20:53 +0000 (18:20 -0800)]
New API 4 with new CDMA constants.
Daniel Sandler [Thu, 5 Nov 2009 20:05:27 +0000 (15:05 -0500)]
New live wallpaper API to expose author and description strings.
First in a sequence of CLs to address
http://b/issue?id=
2235307 .
Change-Id: Id1458b01c8a7918f345823b45e5726e02285d8b5
Fred Quintana [Thu, 5 Nov 2009 19:46:11 +0000 (11:46 -0800)]
resolved conflicts for merge of
f476c480 to eclair-mr2
Amith Yamasani [Thu, 5 Nov 2009 19:41:58 +0000 (11:41 -0800)]
Fix for
2221718: Hang in BatteryStatsService.noteBluetoothOn
This should remove the deadlock. I'm not absolutely positive that
it fixes it, as it's not easy to reproduce.
Jaikumar Ganesh [Thu, 5 Nov 2009 19:27:28 +0000 (11:27 -0800)]
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
This may force some Motorola headsets to thow up the Pairing Request.
Bug:
2210365
Dr No: Eastham
Android (Google) Code Review [Thu, 5 Nov 2009 19:15:54 +0000 (14:15 -0500)]
Merge change I48cbd0bc into eclair
* changes:
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Vasu Nori [Thu, 5 Nov 2009 18:01:09 +0000 (10:01 -0800)]
am
195a507f: Merge change I272af007 into eclair-mr2
Merge commit '
195a507fc364d249c8ff4d3cd86dea00f383b0aa' into eclair-mr2-plus-aosp
* commit '
195a507fc364d249c8ff4d3cd86dea00f383b0aa':
a possible fix for the bug http://b/issue?id=
2200637