13636 Commits

Author SHA1 Message Date
Jack Palevich
a9e47546a5 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.
2009-11-06 00:25:44 -08: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
790bc8f147 am 78e502df: am 892574f5: am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '78e502df5163e8bcdd803af7f0a3958322a288dc'

* commit '78e502df5163e8bcdd803af7f0a3958322a288dc':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 22:13:41 -08:00
Dianne Hackborn
78e502df51 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.
2009-11-05 22:02:56 -08: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
62834b829c am 85fdfd01: am 237cc15c: am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '85fdfd0144c06dcef7652a8dd283f717cabe8759'

* commit '85fdfd0144c06dcef7652a8dd283f717cabe8759':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:57:33 -08:00
Joe Onorato
8c56a63fb0 am 178b6c91: am c92196f6: am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit '178b6c91bcc6a77643f4a5f7939c2120ad41b977'

* commit '178b6c91bcc6a77643f4a5f7939c2120ad41b977':
  Another test for StatusBar test.
2009-11-05 20:57:22 -08:00
Romain Guy
9aed49e2a5 am 57e7109d: am 15b9de8c: am 1d5b3a63: Fix the build
Merge commit '57e7109d13e17ca5b4a8a4b9e3fd952f1afcaf75'

* commit '57e7109d13e17ca5b4a8a4b9e3fd952f1afcaf75':
  Fix the build
2009-11-05 20:57:09 -08:00
Mike Lockwood
8aa136a78c am e0c1bc98: am b31174de: am 9ce3df55: Merge change I2c6e54e4 into eclair
Merge commit 'e0c1bc983431254a6fb4084ccda507f15e8247f6'

* commit 'e0c1bc983431254a6fb4084ccda507f15e8247f6':
  Throttle proximity sensor values so we do not process more than one change a second.
2009-11-05 20:56:57 -08:00
Dianne Hackborn
85fdfd0144 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
2009-11-05 20:49:22 -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
Joe Onorato
178b6c91bc am c92196f6: am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit 'c92196f6932571ddd8b353dd9c9bb37245e3e2de' into eclair-mr2-plus-aosp

* commit 'c92196f6932571ddd8b353dd9c9bb37245e3e2de':
  Another test for StatusBar test.
2009-11-05 20:37:38 -08:00
Romain Guy
57e7109d13 am 15b9de8c: am 1d5b3a63: Fix the build
Merge commit '15b9de8cf217c315acb57044c43a9b12da57b6c4' into eclair-mr2-plus-aosp

* commit '15b9de8cf217c315acb57044c43a9b12da57b6c4':
  Fix the build
2009-11-05 20:37:29 -08:00
Mike Lockwood
e0c1bc9834 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.
2009-11-05 20:37:20 -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
Wei-Ta Chen
88760cf50e am fa43c063: am d512a3b3: Merge change Ic1d72f56 into eclair-mr2
Merge commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624'

* commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624':
  Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
2009-11-05 20:18:42 -08:00
Wink Saville
7cfee29baf am 47601c74: am e14861ea: am 09263e1b: Merge change Id0267cc0 into eclair
Merge commit '47601c74f1302f70716c81714373687358ce8d8b'

* commit '47601c74f1302f70716c81714373687358ce8d8b':
  Add needsOtaServiceProvisioning and used to not allow
2009-11-05 20:18:31 -08:00
James Dong
b09c8ba082 am 421a32fb: am 99588d59: am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '421a32fb31f46860ce77b0e8131178a0af52d087'

* commit '421a32fb31f46860ce77b0e8131178a0af52d087':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 20:18:19 -08:00
Jean-Michel Trivi
76dfdad08f am 5a76b6df: am 571529f8: am d94ed379: Merge change I1dc2ae28 into eclair
Merge commit '5a76b6dfcb8223cd156a8580fa0fc4ded97983db'

* commit '5a76b6dfcb8223cd156a8580fa0fc4ded97983db':
  Fix bug 2242585 to unhide the new audio recording sources.
2009-11-05 20:18:04 -08:00
Wei-Ta Chen
fa43c063a3 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
2009-11-05 20:12:50 -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
Wink Saville
47601c74f1 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
2009-11-05 19:21:47 -08:00
James Dong
421a32fb31 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
2009-11-05 19:21:38 -08:00
Jean-Michel Trivi
5a76b6dfcb 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.
2009-11-05 19:21:27 -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
Michael Chan
cdd2864eb3 b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth 2009-11-05 18:32:08 -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
Android (Google) Code Review
1e495da19f Merge change I4b03c2cd into eclair
* changes:
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 19:15:56 -05:00
Jean-Michel Trivi
571529f821 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.
2009-11-05 16:10:32 -08:00
Romain Guy
e1cd1ef7b9 am b25cb21f: am 8426319c: am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit 'b25cb21f59da53f138bc516a6047f55a2c412764'

* commit 'b25cb21f59da53f138bc516a6047f55a2c412764':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 16:04:32 -08:00
Guang Zhu
901267c08f am 6f116319: am 1c7be08f: am bfa68abc: layout test rebase, bug fix
Merge commit '6f116319367539e3972747da9d300467840f8b2d'

* commit '6f116319367539e3972747da9d300467840f8b2d':
  layout test rebase, bug fix
2009-11-05 16:04:21 -08:00