Commit Graph

6810 Commits

Author SHA1 Message Date
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
Android Code Review
7544dcf836 Merge change I4a783af6
* changes:
  Fix obvious typo bug in egl.cpp
2009-11-05 14:10:10 -08:00
Android Code Review
30d843ae23 Merge change I8f67f092
* changes:
  Fix of compatibility with multifunction extUSB adapters. Tested with HTC YC A300.
2009-11-05 14:08:25 -08: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 Code Review
9273aaf27f Merge change Ifcba56d2
* changes:
  Capture failure of copybit->stretch()
2009-11-05 13:10:16 -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
Android Code Review
9849c93133 Merge change I9ff67a5f
* changes:
  LocationManagerService: Fix race when removing LocationListener
2009-11-05 11:36:48 -08: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
Ravi K Yenduri
025b309a88 Capture failure of copybit->stretch() 2009-11-05 10:42:21 -06: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
Eric Olsen
89dfb82612 am 62335430: Merge change I4499ad72 into eclair
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-plus-aosp

* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
  Fix bad merge fixes build breakage.
2009-11-04 17:36:26 -08:00
Romain Guy
d809616a5d am 131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-plus-aosp

* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
  Remove unused field and add new API to control the children drawing order.
2009-11-04 17:36:16 -08:00
Android (Google) Code Review
5132bf73d4 Merge change I9490271c into eclair
* changes:
  Add BluetoothDevice to SDK AIDL list.
2009-11-04 20:32:00 -05:00
Android Code Review
c5b6ff1b78 Merge change Ic93ca0d7
* changes:
  Don't return when blocking is true.
2009-11-04 17:31:01 -08:00
Android (Google) Code Review
d8e35f8a4c Merge change I4499ad72 into eclair
* changes:
  Fix bad merge fixes build breakage.
2009-11-04 20:27:11 -05:00
Android (Google) Code Review
e9dab9cf84 Merge change I3bbfb4f9 into eclair
* changes:
  Remove unused field and add new API to control the children drawing order.
2009-11-04 19:58:00 -05:00
Eric Olsen
24084b84c7 am 9053fdb3: Merge change I76127f6f into eclair
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-plus-aosp

* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
  Add support for colored LED on jogball backlight.
2009-11-04 16:46:49 -08:00
Android (Google) Code Review
9eaa8e4623 Merge change I76127f6f into eclair
* changes:
  Add support for colored LED on jogball backlight.
2009-11-04 19:39:29 -05:00
Ying Wang
c218bc03eb am b5e380a7: am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit 'b5e380a799b1c22d51364a2b9b3abe02e2eb83cf' into eclair-plus-aosp

* commit 'b5e380a799b1c22d51364a2b9b3abe02e2eb83cf':
  Explicitly specify that online-sdk depends on framework-res. (do not merge)
2009-11-04 16:27:17 -08:00
Ying Wang
1d7f986a53 am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit 'e33044eadfa9969e71e50d1aff165cbc436b13f3' into eclair

* commit 'e33044eadfa9969e71e50d1aff165cbc436b13f3':
  Explicitly specify that online-sdk depends on framework-res. (do not merge)
2009-11-04 16:18:04 -08:00
Android (Google) Code Review
6cf97a3181 Merge change Ib9cc041e into eclair-sdk
* changes:
  Explicitly specify that online-sdk depends on framework-res. (do not merge)
2009-11-04 19:08:59 -05:00
Christopher Tate
96c50c67a8 am 595596fe: Merge change I561011bc into eclair
Merge commit '595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-plus-aosp

* commit '595596fe6b6fd52bf26d224f18b8724a4d151316':
  Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 16:02:06 -08:00
Android (Google) Code Review
cb9b6328dc Merge change I561011bc into eclair
* changes:
  Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 18:52:27 -05:00