9956 Commits

Author SHA1 Message Date
Christopher Tate
307fbbf2b6 am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2

* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:22:54 -08:00
Android (Google) Code Review
883be83eab Merge change I2effb21e into eclair-mr2
* changes:
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 16:08:38 -05:00
Android (Google) Code Review
49fa9e0098 Merge change Ibf6e51b7 into eclair
* changes:
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 15:00:31 -05:00
Evan Millar
c11b225c43 am 7e4a0047: Merge change I97b30e2f into eclair
Merge commit '7e4a004799eae347f1be227ecba6850d1b386bd2' into eclair-mr2

* commit '7e4a004799eae347f1be227ecba6850d1b386bd2':
  Revert jparks code from IPCThreadState.
2009-11-06 11:54:59 -08:00
Android (Google) Code Review
7e4a004799 Merge change I97b30e2f into eclair
* changes:
  Revert jparks code from IPCThreadState.
2009-11-06 14:49:39 -05:00
Charles Mendis
6b07bf3d8f am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:46:43 -08:00
Android (Google) Code Review
3cba72880b Merge change I6ccd2ebc into eclair
* changes:
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 14:39:22 -05:00
Charles Mendis
322591cb4b Expose PowerManager.isScreenOn in the public api.
Change-Id: I6ccd2ebcbf3f8ad9ffa4b86a9c037cb0c25a7b78
2009-11-06 14:37:07 -05:00
Christopher Tate
8ee038d926 Set argv[0] from the main thread of an app, not a random binder thread
Change-Id: Ibf6e51b7975cdb5e6aa97591a571c599ecf84020
2009-11-06 11:30:20 -08:00
Cary Clark
ca3a6dc414 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:
2009-11-06 11:29:40 -08:00
Android (Google) Code Review
f28e0c2ac7 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.
2009-11-06 14:25:26 -05:00
Evan Millar
97b30e2f62 Revert jparks code from IPCThreadState. 2009-11-06 11:25:23 -08:00
Android (Google) Code Review
45011f2dc5 Merge change I4e9fe62b into eclair
* changes:
  do not merge -- original checkin to mr2 here:
2009-11-06 14:23:14 -05:00
Android (Google) Code Review
300160edc9 Merge change I29a3be5b into eclair-mr2
* changes:
  Calendar: add CALLER_IS_SYNCADAPTER parameter.
2009-11-06 13:23:27 -05:00
Xavier Ducrohet
bef1749148 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.
2009-11-06 10:08:03 -08:00
Andreas Huber
be364022fb 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).
2009-11-06 10:07:53 -08:00
Xavier Ducrohet
9eaff61adf am 91bb62f0: New API 4 with new CDMA constants.
Merge commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9' into eclair

* commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9':
  New API 4 with new CDMA constants.
2009-11-06 10:00:29 -08:00
Andreas Huber
9a50fdf467 Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting. 2009-11-06 08:44:26 -08:00
Android (Google) Code Review
fde273baf6 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).
2009-11-06 11:27:03 -05:00
Cary Clark
4e9fe62b37 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
2009-11-06 10:29:30 -05:00
Jared Suttles
1ae7831b8a 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
2009-11-06 06:31:37 -08:00
Mike Lockwood
0cb3f58741 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.
2009-11-06 05:35:04 -08:00
Jared Suttles
8b1243e5e4 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>
2009-11-06 08:28:58 -05:00
Mike Lockwood
0d72f7e9fc 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>
2009-11-06 08:28:19 -05:00
jsh
9e63ce81c5 am 092f0341: Merge change I44d4cbec into eclair
Merge commit '092f03418a4988e4da706dca27128327b5a5fc55' into eclair-mr2

* commit '092f03418a4988e4da706dca27128327b5a5fc55':
  Fix some SMS encode issues.
2009-11-06 00:23:13 -08:00
Suchi Amalapurapu
750e82e519 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.
2009-11-06 00:23:03 -08:00
Jack Palevich
79447b2087 resolved conflicts for merge of 84872738 to eclair-mr2 2009-11-06 00:13:38 -08:00
Android (Google) Code Review
092f03418a Merge change I44d4cbec into eclair
* changes:
  Fix some SMS encode issues.
2009-11-06 03:07:01 -05:00
jsh
3e5c3a6db4 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)
2009-11-05 23:39:21 -08:00
Android (Google) Code Review
bf50200ba4 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.
2009-11-06 02:12:40 -05:00
Android (Google) Code Review
84872738f2 Merge change I971f6fd3 into eclair
* changes:
  Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-06 01:23:52 -05:00
Dianne Hackborn
892574f5f9 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.
2009-11-05 21:57:51 -08:00
Dianne Hackborn
13bf826013 Fix SDK build: a few things missing, a link that was wrong.
Change-Id: I55c9c510b3f0866ce6085927afa00b9fb69dd8c5
2009-11-05 21:45:51 -08:00
Dianne Hackborn
237cc15c17 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
2009-11-05 20:41:50 -08:00
Dianne Hackborn
274b120f39 Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Change-Id: I7e996bf549922c1bb8e8c00d051650ffe12d818c
2009-11-05 20:35:23 -08:00
Joe Onorato
c92196f693 am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-mr2

* commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
  Another test for StatusBar test.
2009-11-05 20:28:10 -08:00
Romain Guy
15b9de8cf2 am 1d5b3a63: Fix the build
Merge commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0' into eclair-mr2

* commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0':
  Fix the build
2009-11-05 20:27:53 -08:00
Mike Lockwood
b31174de6a 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.
2009-11-05 20:26:44 -08:00
Dan Egnor
2effb21e89 Add UPDATE_ACTION to Gservices, used by the new checkin service. 2009-11-05 20:08:49 -08:00
Android (Google) Code Review
d512a3b3a8 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.
2009-11-05 23:07:33 -05:00
Wei-Ta Chen
c1d72f5697 Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
to from the full image, if both can generate of a thumbnail of same size.
2009-11-06 11:56:52 +08:00
Android (Google) Code Review
c3f3f9a90b Merge change Ie71d9e42 into eclair
* changes:
  Another test for StatusBar test.
2009-11-05 22:20:02 -05:00
Suchi Amalapurapu
c9568e3989 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.
2009-11-05 19:13:18 -08:00
Wink Saville
e14861eaa7 am 09263e1b: Merge change Id0267cc0 into eclair
Merge commit '09263e1bc0f8f783b24b92643d4ccda87966d01f' into eclair-mr2

* commit '09263e1bc0f8f783b24b92643d4ccda87966d01f':
  Add needsOtaServiceProvisioning and used to not allow
2009-11-05 19:10:43 -08:00
James Dong
99588d590f 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
2009-11-05 19:09:58 -08:00
Romain Guy
1d5b3a631c Fix the build
Change-Id: Id7514858594772ab79c0f3db745b00f0bb59218b
2009-11-05 18:45:10 -08:00
Jack Palevich
8b2c9c9ecb 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.
2009-11-06 10:21:46 +08:00
Android (Google) Code Review
9ce3df55ba Merge change I2c6e54e4 into eclair
* changes:
  Throttle proximity sensor values so we do not process more than one change a second.
2009-11-05 20:29:54 -05:00
Andreas Huber
c997acacd5 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). 2009-11-05 16:34:39 -08:00
Android (Google) Code Review
09263e1bc0 Merge change Id0267cc0 into eclair
* changes:
  Add needsOtaServiceProvisioning and used to not allow data calls until the device is provisioned.
2009-11-05 19:25:11 -05:00