Commit Graph

6960 Commits

Author SHA1 Message Date
Grace Kloba
e7974237b7 am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK.
Merge commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-plus-aosp

* commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
  Remove "@hide pending API council" in webkit to expose
2009-11-07 10:56:25 -08:00
Eric Laurent
ee47d43ed3 More log for issue 2242381.
Added more log in system dump for AudioFlinger and AudioPolicyService to help debug issue 2242381 and other issues where the audio driver hangs.
2009-11-07 01:18:20 -08:00
Charles Mendis
8a6893cb63 am 638d8653: Merge change I47ef4266 into eclair
Merge commit '638d86535264b24b54698fca7e18e68571fe0bad' into eclair-plus-aosp

* commit '638d86535264b24b54698fca7e18e68571fe0bad':
  Expose WallpaperSettingsActivity in the public API.
2009-11-06 22:12:05 -08:00
Android (Google) Code Review
982b02c442 Merge change I47ef4266 into eclair
* changes:
  Expose WallpaperSettingsActivity in the public API.
2009-11-07 01:05:34 -05:00
Romain Guy
3631091240 am 9d790678: Merge change I32ce8591 into eclair
Merge commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b' into eclair-plus-aosp

* commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b':
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 18:36:25 -08:00
Android (Google) Code Review
dbc95f6560 Merge change I32ce8591 into eclair
* changes:
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 21:29:56 -05:00
Mathias Agopian
014a04af4f am 45dd12cb: Merge change I9f3020db into eclair
Merge commit '45dd12cb0834ea5d72872a6d5b3095f3af152434' into eclair-plus-aosp

* commit '45dd12cb0834ea5d72872a6d5b3095f3af152434':
  fix [2243164] live wallpaper screen artifacts at end of boot
2009-11-06 17:16:15 -08:00
Android (Google) Code Review
80482a8254 Merge change I9f3020db into eclair
* changes:
  fix [2243164] live wallpaper screen artifacts at end of boot
2009-11-06 20:08:35 -05:00
Jack Palevich
a2df48e0f6 am 4e3fadd0: Merge change Ia4424950 into eclair
Merge commit '4e3fadd0c99d2774709a067e017d8fd622440f0e' into eclair-plus-aosp

* commit '4e3fadd0c99d2774709a067e017d8fd622440f0e':
  Fix stupid bug in GLThreadManager implementation.
2009-11-06 16:11:50 -08:00
Android (Google) Code Review
c322be4d66 Merge change Ia4424950 into eclair
* changes:
  Fix stupid bug in GLThreadManager implementation.
2009-11-06 19:00:54 -05:00
Scott Main
49fa6ea3cd am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-plus-aosp

* commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b':
  docs: add new document for the win usb driver;
2009-11-06 15:48:20 -08:00
Scott Main
67dc76a446 am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '0e08055aa31c752732005fc48b09ee470a2c4822' into eclair

* commit '0e08055aa31c752732005fc48b09ee470a2c4822':
  docs: add new document for the win usb driver;
2009-11-06 15:41:28 -08:00
Dave Sparks
3cd6d693d9 am 7ab900ed: Merge change Ic8093c11 into eclair
Merge commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3' into eclair-plus-aosp

* commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3':
  Hold a lock while we access the preview heap.
2009-11-06 14:09:17 -08:00
Evan Millar
fc17670a39 am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-plus-aosp

* commit '2b3970a2956152a508254aa2675b68df363d46c1':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:06:11 -08:00
Android (Google) Code Review
ead5bb7e70 Merge change Ic8093c11 into eclair
* changes:
  Hold a lock while we access the preview heap.
2009-11-06 17:03:52 -05:00
Android (Google) Code Review
236ffad0f2 Merge change I14a9acd3 into eclair-sdk
* changes:
  docs: add new document for the win usb driver; remove usb guide from the device document.
2009-11-06 16:57:12 -05:00
Android (Google) Code Review
d086c1cd50 Merge change Idc1396c8 into eclair
* changes:
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 16:56:51 -05:00
Michael Chan
0b411b0cc5 am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-plus-aosp

* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:32:53 -08:00
Android (Google) Code Review
83d64f3eb9 Merge change Icdd2864e into eclair
* changes:
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 16:23:42 -05:00
jsh
8cde4c0f17 am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-plus-aosp

* commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595':
  Update CdmaSmsTest unit test.
2009-11-06 13:03:05 -08:00
Mike Lockwood
3e878c7d6c am b8933665: Merge change I3f0ded49 into eclair
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-plus-aosp

* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
  Increase light sensor delay from one to two seconds.
2009-11-06 13:02:54 -08:00
Christopher Tate
f4455f4a95 am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-plus-aosp

* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:02:44 -08:00
Android (Google) Code Review
717d0873e7 Merge change Ie994c0e8 into eclair
* changes:
  Update CdmaSmsTest unit test.
2009-11-06 15:58:20 -05:00
Android (Google) Code Review
029474aa86 Merge change I3f0ded49 into eclair
* changes:
  Increase light sensor delay from one to two seconds.
2009-11-06 15:55:52 -05:00
Android (Google) Code Review
046c4120a5 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
7b348406c7 am 7e4a0047: Merge change I97b30e2f into eclair
Merge commit '7e4a004799eae347f1be227ecba6850d1b386bd2' into eclair-plus-aosp

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

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:47:57 -08:00
Dave Sparks
23c21baf27 Hold a lock while we access the preview heap.
copyFrameAndPostCopiedFrame was not holding a lock while it accessed
the preview heap. If the client process is torn down while the heap
is accessed, the memcpy could access memory that was deallocated.

This patch creates a local sp reference to the preview heap while
holding the lock, then releases the lock. This should prevent the
heap from being pulled out from underneath us.
2009-11-06 11:47:13 -08:00
Android (Google) Code Review
3d490a0c2a Merge change I6ccd2ebc into eclair
* changes:
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 14:39:22 -05:00
Cary Clark
0b92d28bc5 am 45011f2d: Merge change I4e9fe62b into eclair
Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-plus-aosp

* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
  do not merge -- original checkin to mr2 here:
2009-11-06 11:29:59 -08:00
Evan Millar
6dfe8f1ffa Revert jparks code from IPCThreadState. 2009-11-06 11:25:23 -08:00
Android (Google) Code Review
c948ba7f7f Merge change I4e9fe62b into eclair
* changes:
  do not merge -- original checkin to mr2 here:
2009-11-06 14:23:14 -05:00
Xavier Ducrohet
e22c55e109 am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.
Merge commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-plus-aosp

* commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed':
  New API 4 with new CDMA constants.
2009-11-06 10:07:58 -08:00
Andreas Huber
32f58f0882 am fde273ba: Merge change Ic997acac into eclair
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-plus-aosp

* 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:47 -08:00
Xavier Ducrohet
1ef5d4730b 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
Android (Google) Code Review
bd63507a56 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
Jared Suttles
0b847e1403 am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-plus-aosp

* commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f':
  jni: GpsLocationProvider: Check for pending callbacks before waiting
2009-11-06 06:31:23 -08:00
Mike Lockwood
dfb9def65f 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-plus-aosp

* commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42':
  Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
2009-11-06 05:34:44 -08:00
jsh
77d969cf0d am 092f0341: Merge change I44d4cbec into eclair
Merge commit '092f03418a4988e4da706dca27128327b5a5fc55' into eclair-plus-aosp

* commit '092f03418a4988e4da706dca27128327b5a5fc55':
  Fix some SMS encode issues.
2009-11-06 00:15:17 -08:00
Android (Google) Code Review
c47c0789be Merge change I44d4cbec into eclair
* changes:
  Fix some SMS encode issues.
2009-11-06 03:07:01 -05:00
Suchi Amalapurapu
267a9638f9 am bf50200b: Merge change Ic9568e39 into eclair
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-plus-aosp

* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
  When tasks are moved to top or bottom, the app tokens are being rearranged.
2009-11-05 23:19:42 -08:00
Android (Google) Code Review
91af123791 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
Jack Palevich
f5f5e5fcb2 am 84872738: Merge change I971f6fd3 into eclair
Merge commit '84872738f291faf25ae07235cde382d38c796567' into eclair-plus-aosp

* commit '84872738f291faf25ae07235cde382d38c796567':
  Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-05 22:32:14 -08:00
Android (Google) Code Review
b472673929 Merge change I971f6fd3 into eclair
* changes:
  Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-06 01:23:52 -05:00
Dianne Hackborn
87a062cec5 am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-plus-aosp

* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 21:58:46 -08:00
Dianne Hackborn
00ccec7079 am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-plus-aosp

* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:41:50 -08:00
Joe Onorato
b10ca5aa60 am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-plus-aosp

* commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
  Another test for StatusBar test.
2009-11-05 19:26:17 -08:00
Android (Google) Code Review
2f88725b51 Merge change Ie71d9e42 into eclair
* changes:
  Another test for StatusBar test.
2009-11-05 22:20:02 -05:00
Romain Guy
8d6a44880f am 1d5b3a63: Fix the build
Merge commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0' into eclair-plus-aosp

* commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0':
  Fix the build
2009-11-05 18:52:11 -08:00