11832 Commits

Author SHA1 Message Date
Android (Google) Code Review
97f96ef9f7 Merge change I7f9db307 into eclair-mr2
* changes:
  Modify the behavior of createThumbnailForEXIF() to: returning SizedThumbnailBitmap, which contains the downsampled bitmap either from the thumbnail in EXIF or the full image.
2009-11-05 04:49:46 -05:00
Wei-Ta Chen
6706caf937 Modify the behavior of createThumbnailForEXIF() to:
returning SizedThumbnailBitmap, which contains the downsampled
bitmap either from the thumbnail in EXIF or the full image.
2009-11-05 16:53:27 +08:00
Eric Laurent
fcae6c7179 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:33 -08:00
Android (Google) Code Review
67b692920c Merge change I93f500a5 into eclair
* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:55:26 -05:00
Eric Laurent
bda7469d9b Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
2009-11-04 23:47:21 -08:00
James Dong
b1c85ec47a Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java 2009-11-04 23:00:09 -08:00
Daisuke Miyakawa
931203d405 am dc0f9efd: Merge change I0d442f0d into eclair-mr2
Merge commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp

* commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
  Add tests for Japanization part of vCard.
2009-11-04 20:57:35 -08:00
Romain Guy
4deb52f3c1 am 20777fae: am 584bce31: Merge change I09282f5b into eclair
Merge commit '20777fae8757036d7d526cf74673d30993b77ac5' into eclair-mr2-plus-aosp

* commit '20777fae8757036d7d526cf74673d30993b77ac5':
  Fix the build (hopefully.)
2009-11-04 20:57:27 -08:00
Android (Google) Code Review
dc0f9efd35 Merge change I0d442f0d into eclair-mr2
* changes:
  Add tests for Japanization part of vCard.
2009-11-04 23:49:46 -05:00
Daisuke Miyakawa
4fe2c57c3c Add tests for Japanization part of vCard.
Fix several bugs around name construction.

Internal issue number: 2195990
2009-11-05 13:47:48 +09:00
Romain Guy
20777fae87 am 584bce31: Merge change I09282f5b into eclair
Merge commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-mr2

* commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6':
  Fix the build (hopefully.)
2009-11-04 18:40:38 -08:00
Android (Google) Code Review
584bce31b6 Merge change I09282f5b into eclair
* changes:
  Fix the build (hopefully.)
2009-11-04 21:33:27 -05:00
Romain Guy
cca9e279f8 Fix the build (hopefully.)
Change-Id: I09282f5b4ff8b97f6beb1073223d8a943d3ecef4
2009-11-04 18:32:48 -08:00
Nick Pelly
2806a8f57b am 8cf6a2ea: am 61b01632: Merge change I9490271c into eclair
Merge commit '8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d' into eclair-mr2-plus-aosp

* commit '8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d':
  Add BluetoothDevice to SDK AIDL list.
2009-11-04 17:46:43 -08:00
Eric Olsen
d6210cdeb7 am e772eb7a: am 62335430: Merge change I4499ad72 into eclair
Merge commit 'e772eb7af049b55c89241fae799569030c1f5570' into eclair-mr2-plus-aosp

* commit 'e772eb7af049b55c89241fae799569030c1f5570':
  Fix bad merge fixes build breakage.
2009-11-04 17:46:35 -08:00
Romain Guy
77e68484f5 am 05abe8d0: am 131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71' into eclair-mr2-plus-aosp

* commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71':
  Remove unused field and add new API to control the children drawing order.
2009-11-04 17:46:24 -08:00
Nick Pelly
8cf6a2eacf am 61b01632: Merge change I9490271c into eclair
Merge commit '61b01632915181fcf725dc4933cad8c81e700115' into eclair-mr2

* commit '61b01632915181fcf725dc4933cad8c81e700115':
  Add BluetoothDevice to SDK AIDL list.
2009-11-04 17:37:07 -08:00
Eric Olsen
e772eb7af0 am 62335430: Merge change I4499ad72 into eclair
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2

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

* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
  Remove unused field and add new API to control the children drawing order.
2009-11-04 17:36:46 -08:00
Android (Google) Code Review
61b0163291 Merge change I9490271c into eclair
* changes:
  Add BluetoothDevice to SDK AIDL list.
2009-11-04 20:32:00 -05:00
Android Code Review
0b95a572a0 Merge change Ic93ca0d7
* changes:
  Don't return when blocking is true.
2009-11-04 17:31:01 -08:00
Android (Google) Code Review
62335430b0 Merge change I4499ad72 into eclair
* changes:
  Fix bad merge fixes build breakage.
2009-11-04 20:27:11 -05:00
Nick Pelly
459ba8639a Add BluetoothDevice to SDK AIDL list.
Bug: 2216702
Change-Id: I9490271ce4be465d5b3acc5e530feaf6e2fa3f57
2009-11-04 17:24:46 -08:00
Eric Olsen
4499ad729a Fix bad merge fixes build breakage.
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-04 17:12:41 -08:00
Android (Google) Code Review
131564d26a 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
Romain Guy
293451e4f0 Remove unused field and add new API to control the children drawing order.
Approved by: xav, hackbod, mcleron.

Change-Id: I3bbfb4f96e3c9adedbb68d78703059a2df1e2013
2009-11-04 16:57:07 -08:00
Eric Olsen
122f412a01 am 76922b83: am 9053fdb3: Merge change I76127f6f into eclair
Merge commit '76922b8378f235e79fd861ba846bed833199e59f' into eclair-mr2-plus-aosp

* commit '76922b8378f235e79fd861ba846bed833199e59f':
  Add support for colored LED on jogball backlight.
2009-11-04 16:54:29 -08:00
Daisuke Miyakawa
7557e54700 am 5dbeef6e: Merge change I76588b56 into eclair-mr2
Merge commit '5dbeef6e9844a094f87a3f7d4608b431a6724278' into eclair-mr2-plus-aosp

* commit '5dbeef6e9844a094f87a3f7d4608b431a6724278':
  Make vCard importer handle "PAGER" phone number correctly.
2009-11-04 16:54:20 -08:00
Eric Olsen
76922b8378 am 9053fdb3: Merge change I76127f6f into eclair
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2

* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
  Add support for colored LED on jogball backlight.
2009-11-04 16:49:31 -08:00
Android (Google) Code Review
5dbeef6e98 Merge change I76588b56 into eclair-mr2
* changes:
  Make vCard importer handle "PAGER" phone number correctly.
2009-11-04 19:45:14 -05:00
Daisuke Miyakawa
26ee0ae9de Make vCard importer handle "PAGER" phone number correctly.
Add tests for it.

Internal issue number: 2239492
2009-11-05 09:44:42 +09:00
Ying Wang
c526e5d57b am 35ea90de: am b5e380a7: (-s ours) am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit '35ea90deee5050a66909b2740601bd81f9f29780' into eclair-mr2-plus-aosp

* commit '35ea90deee5050a66909b2740601bd81f9f29780':
  Explicitly specify that online-sdk depends on framework-res. (do not merge)
2009-11-04 16:42:17 -08:00
Christopher Tate
9d45108a5f am 888b702c: am 595596fe: Merge change I561011bc into eclair
Merge commit '888b702c81b21847b19c4e2845686ed35cc03a0e' into eclair-mr2-plus-aosp

* commit '888b702c81b21847b19c4e2845686ed35cc03a0e':
  Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 16:42:10 -08:00
Android (Google) Code Review
9053fdb32b Merge change I76127f6f into eclair
* changes:
  Add support for colored LED on jogball backlight.
2009-11-04 19:39:29 -05:00
Ying Wang
35ea90deee am b5e380a7: (-s ours) am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit 'b5e380a799b1c22d51364a2b9b3abe02e2eb83cf' into eclair-mr2

* commit 'b5e380a799b1c22d51364a2b9b3abe02e2eb83cf':
  Explicitly specify that online-sdk depends on framework-res. (do not merge)
2009-11-04 16:35:15 -08:00
Christopher Tate
888b702c81 am 595596fe: Merge change I561011bc into eclair
Merge commit '595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-mr2

* commit '595596fe6b6fd52bf26d224f18b8724a4d151316':
  Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 16:35:06 -08:00
Vasu Nori
272af00768 a possible fix for the bug http://b/issue?id=2200637 2009-11-04 16:26:55 -08:00
Ying Wang
b5e380a799 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
e33044eadf 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
Ying Wang
b9cc041eb0 Explicitly specify that online-sdk depends on framework-res. (do not merge)
this is integrated from Eclair to fix the mac build breakages.
2009-11-04 16:04:26 -08:00
Android (Google) Code Review
595596fe6b Merge change I561011bc into eclair
* changes:
  Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 18:52:27 -05:00
Jason Parks
3e1000b706 am 6176790e: am ef16a545: Merge change I2867746d into eclair
Merge commit '6176790ed5f21ab102d438c252509deda050da0b' into eclair-mr2-plus-aosp

* commit '6176790ed5f21ab102d438c252509deda050da0b':
  When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
2009-11-04 15:10:22 -08:00
Mathias Agopian
ba37ea550d am 6d9e0c7a: am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebuffer
Merge commit '6d9e0c7aa797f4dae5f529560e9e7c31336624e3' into eclair-mr2-plus-aosp

* commit '6d9e0c7aa797f4dae5f529560e9e7c31336624e3':
  part of fix [2186418] switch passion to 24-bits framebuffer
2009-11-04 15:10:13 -08:00
Leon Scroggins
ffb4eeb54b am 3613385f: Do not update the progress if it is the same as the last given progress.
Merge commit '3613385fbc5368715e7af1a6676b7bb63fafcf09' into eclair-mr2-plus-aosp

* commit '3613385fbc5368715e7af1a6676b7bb63fafcf09':
  Do not update the progress if it is the same as the last given progress.
2009-11-04 15:10:05 -08:00
Jason Parks
6176790ed5 am ef16a545: Merge change I2867746d into eclair
Merge commit 'ef16a545dca8deacdcdd89cb493d556adf7a8be8' into eclair-mr2

* commit 'ef16a545dca8deacdcdd89cb493d556adf7a8be8':
  When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
2009-11-04 14:59:54 -08:00
Mathias Agopian
6d9e0c7aa7 am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebuffer
Merge commit '36fe3eeaa056ff13455c0df73b495b2bae8c1469' into eclair-mr2

* commit '36fe3eeaa056ff13455c0df73b495b2bae8c1469':
  part of fix [2186418] switch passion to 24-bits framebuffer
2009-11-04 14:59:44 -08:00
Android (Google) Code Review
ef16a545dc Merge change I2867746d into eclair
* changes:
  When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
2009-11-04 17:54:00 -05:00
Mathias Agopian
36fe3eeaa0 part of fix [2186418] switch passion to 24-bits framebuffer
add support for RGBX_8888 EGLConfigs in the software renderer
(since that's what we're using in the MDP case)
2009-11-04 14:51:18 -08:00
Leon Scroggins
3613385fbc Do not update the progress if it is the same as the last given progress. 2009-11-04 14:50:14 -08:00
Dirk Dougherty
5b40ead81b am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '0d55daffc31c123dcf83f6db85f8198854ddc564' into eclair-mr2-plus-aosp

* commit '0d55daffc31c123dcf83f6db85f8198854ddc564':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:32:34 -08:00