Commit Graph

6670 Commits

Author SHA1 Message Date
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
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
Mike Lockwood
2b9bde4cb4 am 9ce3df55: Merge change I2c6e54e4 into eclair
Merge commit '9ce3df55bab12bea563faf764f7beb3555d5942c' into eclair-plus-aosp

* commit '9ce3df55bab12bea563faf764f7beb3555d5942c':
  Throttle proximity sensor values so we do not process more than one change a second.
2009-11-05 17:38:12 -08:00
Android (Google) Code Review
ae34e5b744 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
Wink Saville
8d8d62d5e4 am 09263e1b: Merge change Id0267cc0 into eclair
Merge commit '09263e1bc0f8f783b24b92643d4ccda87966d01f' into eclair-plus-aosp

* commit '09263e1bc0f8f783b24b92643d4ccda87966d01f':
  Add needsOtaServiceProvisioning and used to not allow
2009-11-05 16:33:50 -08:00
James Dong
5b2ca37d92 am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-plus-aosp

* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 16:26:07 -08:00
Android (Google) Code Review
d3fa28d41e 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
cfb74fc818 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
0431a71c4a am d94ed379: Merge change I1dc2ae28 into eclair
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp

* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
  Fix bug 2242585 to unhide the new audio recording sources.
2009-11-05 16:10:18 -08:00
Android (Google) Code Review
d4f7b8bb60 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
2009-11-05 19:03:09 -05:00
Romain Guy
5082512b94 am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-plus-aosp

* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 15:47:38 -08:00
Guang Zhu
441b753e81 am bfa68abc: layout test rebase, bug fix
Merge commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7' into eclair-plus-aosp

* commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7':
  layout test rebase, bug fix
2009-11-05 15:47:29 -08:00
Android (Google) Code Review
653e129a82 Merge change Idf40f3b0 into eclair
* changes:
  Prevent crash in Home when using widgets whose ids collide with Home's resources.
2009-11-05 18:42:14 -05:00
Romain Guy
471afca7fc 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
2009-11-05 15:40:35 -08:00
Jason Sams
cf2afa9366 am 902051df: Merge change I0e27b5ca into eclair
Merge commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087' into eclair-plus-aosp

* commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087':
  Fix texture upload bug for narrow texture of less than 32bpp.
2009-11-05 14:46:21 -08:00
Jaikumar Ganesh
58b16c7bc3 am 8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-plus-aosp

* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 14:46:11 -08:00
Android (Google) Code Review
b12789a828 Merge change I0e27b5ca into eclair
* changes:
  Fix texture upload bug for narrow texture of less than 32bpp.
2009-11-05 17:39:56 -05:00
Android (Google) Code Review
d0e907b258 Merge change I21d0dca3 into eclair
* changes:
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 17:15:51 -05:00
Andreas Huber
790a553301 am 05eca1d4: Merge change Ie80e2381 into eclair
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp

* commit '05eca1d46a45723a57899dabad698537b7faef82':
  DO NOT MERGE: Squashed commit of the following:
2009-11-05 13:58:55 -08:00
Android (Google) Code Review
cc4a63efab Merge change Ie80e2381 into eclair
* changes:
  DO NOT MERGE: Squashed commit of the following:
2009-11-05 16:50:34 -05:00
Amith Yamasani
26271d1d2a am 4ab2c777: Merge change I14fb81af into eclair
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-plus-aosp

* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
  Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
2009-11-05 13:16:40 -08:00
Andreas Huber
a39b970231 am 818a9cf8: Merge change Ia4eedace into eclair
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-plus-aosp

* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
  Now that UseBuffer on this component is fixed, let's use it.
2009-11-05 13:16:32 -08:00
Android (Google) Code Review
cfe0ef2427 Merge change I14fb81af into eclair
* changes:
  Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
2009-11-05 16:08:40 -05:00
Android (Google) Code Review
6b248dfea7 Merge change Ia4eedace into eclair
* changes:
  Now that UseBuffer on this component is fixed, let's use it.
2009-11-05 16:01:50 -05:00
Daniel Sandler
be1b5a459a am eca41b31: Merge change Id1458b01 into eclair
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-plus-aosp

* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
  New live wallpaper API to expose author and description strings.
2009-11-05 13:00:39 -08:00
Android (Google) Code Review
b8f8446c46 Merge change Id1458b01 into eclair
* changes:
  New live wallpaper API to expose author and description strings.
2009-11-05 15:53:25 -05:00
Fred Quintana
bf0efc10ee am f476c480: Merge change I48cbd0bc into eclair
Merge commit 'f476c480cdf41be9989c3cfbc3b92038d11e7569' into eclair-plus-aosp

* commit 'f476c480cdf41be9989c3cfbc3b92038d11e7569':
  remove the SubscribedFeedsProvider since it has been moved to vendor/google
2009-11-05 11:24:29 -08:00
Android (Google) Code Review
7919cd02fa Merge change I48cbd0bc into eclair
* changes:
  remove the SubscribedFeedsProvider since it has been moved to vendor/google
2009-11-05 14:15:54 -05:00
Eric Laurent
b44b45851b am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:50 -08:00
Android (Google) Code Review
a868f443a4 Merge change I93f500a5 into eclair
* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:55:26 -05:00
Romain Guy
c7758f51af am 584bce31: Merge change I09282f5b into eclair
Merge commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-plus-aosp

* commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6':
  Fix the build (hopefully.)
2009-11-04 18:40:13 -08:00
Android (Google) Code Review
d9f4705d89 Merge change I09282f5b into eclair
* changes:
  Fix the build (hopefully.)
2009-11-04 21:33:27 -05:00
Nick Pelly
a9975b60f2 am 61b01632: Merge change I9490271c into eclair
Merge commit '61b01632915181fcf725dc4933cad8c81e700115' into eclair-plus-aosp

* commit '61b01632915181fcf725dc4933cad8c81e700115':
  Add BluetoothDevice to SDK AIDL list.
2009-11-04 17:36:34 -08:00