OSDN Git Service
Eric Laurent [Thu, 5 Nov 2009 10:01:30 +0000 (02:01 -0800)]
am
653d5d41: am
fcae6c71: am
67b69292: Merge change I93f500a5 into eclair
Merge commit '
653d5d415c3447a4250120548bf32d1ee63fe36f'
* commit '
653d5d415c3447a4250120548bf32d1ee63fe36f':
Fix issue
2203561: Sholes: audio playing out of earpiece.
Eric Laurent [Thu, 5 Nov 2009 09:55:51 +0000 (01:55 -0800)]
am
fcae6c71: am
67b69292: Merge change I93f500a5 into eclair
Merge commit '
fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp
* commit '
fcae6c71794696a074cabf20beeb02fd87853e30':
Fix issue
2203561: Sholes: audio playing out of earpiece.
Eric Laurent [Thu, 5 Nov 2009 08:01:33 +0000 (00:01 -0800)]
am
67b69292: Merge change I93f500a5 into eclair
Merge commit '
67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2
* commit '
67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue
2203561: Sholes: audio playing out of earpiece.
Android (Google) Code Review [Thu, 5 Nov 2009 07:55:26 +0000 (02:55 -0500)]
Merge change I93f500a5 into eclair
* changes:
Fix issue
2203561: Sholes: audio playing out of earpiece.
Eric Laurent [Wed, 4 Nov 2009 16:27:26 +0000 (08:27 -0800)]
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.
Daisuke Miyakawa [Thu, 5 Nov 2009 05:06:54 +0000 (21:06 -0800)]
am
931203d4: am
dc0f9efd: Merge change I0d442f0d into eclair-mr2
Merge commit '
931203d4052ad9e02cc0a49b5d6b68c44e4d4072'
* commit '
931203d4052ad9e02cc0a49b5d6b68c44e4d4072':
Add tests for Japanization part of vCard.
Romain Guy [Thu, 5 Nov 2009 05:06:42 +0000 (21:06 -0800)]
am
4deb52f3: am
20777fae: am
584bce31: Merge change I09282f5b into eclair
Merge commit '
4deb52f3c1a645ae2daa8dd31e72460ead2cd372'
* commit '
4deb52f3c1a645ae2daa8dd31e72460ead2cd372':
Fix the build (hopefully.)
Daisuke Miyakawa [Thu, 5 Nov 2009 04:57:35 +0000 (20:57 -0800)]
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.
Romain Guy [Thu, 5 Nov 2009 04:57:27 +0000 (20:57 -0800)]
am
20777fae: am
584bce31: Merge change I09282f5b into eclair
Merge commit '
20777fae8757036d7d526cf74673d30993b77ac5' into eclair-mr2-plus-aosp
* commit '
20777fae8757036d7d526cf74673d30993b77ac5':
Fix the build (hopefully.)
Android (Google) Code Review [Thu, 5 Nov 2009 04:49:46 +0000 (23:49 -0500)]
Merge change I0d442f0d into eclair-mr2
* changes:
Add tests for Japanization part of vCard.
Daisuke Miyakawa [Thu, 5 Nov 2009 04:41:24 +0000 (13:41 +0900)]
Add tests for Japanization part of vCard.
Fix several bugs around name construction.
Internal issue number:
2195990
Romain Guy [Thu, 5 Nov 2009 02:40:38 +0000 (18:40 -0800)]
am
584bce31: Merge change I09282f5b into eclair
Merge commit '
584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-mr2
* commit '
584bce31b62cdf3efd8a9eb40442c4cc612ce1e6':
Fix the build (hopefully.)
Android (Google) Code Review [Thu, 5 Nov 2009 02:33:27 +0000 (21:33 -0500)]
Merge change I09282f5b into eclair
* changes:
Fix the build (hopefully.)
Romain Guy [Thu, 5 Nov 2009 02:32:48 +0000 (18:32 -0800)]
Fix the build (hopefully.)
Change-Id: I09282f5b4ff8b97f6beb1073223d8a943d3ecef4
Nick Pelly [Thu, 5 Nov 2009 01:57:02 +0000 (17:57 -0800)]
am
2806a8f5: am
8cf6a2ea: am
61b01632: Merge change I9490271c into eclair
Merge commit '
2806a8f57bfc0a311ddaa9e31a21662ca54ff5e2'
* commit '
2806a8f57bfc0a311ddaa9e31a21662ca54ff5e2':
Add BluetoothDevice to SDK AIDL list.
Eric Olsen [Thu, 5 Nov 2009 01:56:52 +0000 (17:56 -0800)]
am
d6210cde: am
e772eb7a: am
62335430: Merge change I4499ad72 into eclair
Merge commit '
d6210cdeb72bee9de12a9f69da9f2cd8011f37e0'
* commit '
d6210cdeb72bee9de12a9f69da9f2cd8011f37e0':
Fix bad merge fixes build breakage.
Romain Guy [Thu, 5 Nov 2009 01:56:38 +0000 (17:56 -0800)]
am
77e68484: am
05abe8d0: am
131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '
77e68484f5592e06ca1a881745070f7931641246'
* commit '
77e68484f5592e06ca1a881745070f7931641246':
Remove unused field and add new API to control the children drawing order.
Nick Pelly [Thu, 5 Nov 2009 01:46:43 +0000 (17:46 -0800)]
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.
Eric Olsen [Thu, 5 Nov 2009 01:46:35 +0000 (17:46 -0800)]
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.
Romain Guy [Thu, 5 Nov 2009 01:46:24 +0000 (17:46 -0800)]
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.
Nick Pelly [Thu, 5 Nov 2009 01:37:07 +0000 (17:37 -0800)]
am
61b01632: Merge change I9490271c into eclair
Merge commit '
61b01632915181fcf725dc4933cad8c81e700115' into eclair-mr2
* commit '
61b01632915181fcf725dc4933cad8c81e700115':
Add BluetoothDevice to SDK AIDL list.
Eric Olsen [Thu, 5 Nov 2009 01:36:59 +0000 (17:36 -0800)]
am
62335430: Merge change I4499ad72 into eclair
Merge commit '
62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2
* commit '
62335430b05d92ad2255bf20b76b35e012b385c9':
Fix bad merge fixes build breakage.
Romain Guy [Thu, 5 Nov 2009 01:36:46 +0000 (17:36 -0800)]
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.
Android (Google) Code Review [Thu, 5 Nov 2009 01:32:00 +0000 (20:32 -0500)]
Merge change I9490271c into eclair
* changes:
Add BluetoothDevice to SDK AIDL list.
Android (Google) Code Review [Thu, 5 Nov 2009 01:27:11 +0000 (20:27 -0500)]
Merge change I4499ad72 into eclair
* changes:
Fix bad merge fixes build breakage.
Nick Pelly [Thu, 5 Nov 2009 01:23:55 +0000 (17:23 -0800)]
Add BluetoothDevice to SDK AIDL list.
Bug:
2216702
Change-Id: I9490271ce4be465d5b3acc5e530feaf6e2fa3f57
Eric Olsen [Thu, 5 Nov 2009 01:11:53 +0000 (17:11 -0800)]
Fix bad merge fixes build breakage.
Signed-off-by: Eric Olsen <eolsen@android.com>
Eric Olsen [Thu, 5 Nov 2009 01:08:26 +0000 (17:08 -0800)]
am
122f412a: am
76922b83: am
9053fdb3: Merge change I76127f6f into eclair
Merge commit '
122f412a0177c54e32d52a23bf92b78aae4679f7'
* commit '
122f412a0177c54e32d52a23bf92b78aae4679f7':
Add support for colored LED on jogball backlight.
Daisuke Miyakawa [Thu, 5 Nov 2009 01:08:16 +0000 (17:08 -0800)]
am
7557e547: am
5dbeef6e: Merge change I76588b56 into eclair-mr2
Merge commit '
7557e54700d266f6c44a4ed5c13c52a67599cbe3'
* commit '
7557e54700d266f6c44a4ed5c13c52a67599cbe3':
Make vCard importer handle "PAGER" phone number correctly.
Ying Wang [Thu, 5 Nov 2009 01:08:06 +0000 (17:08 -0800)]
am
c526e5d5: (-s ours) am
35ea90de: am
b5e380a7: (-s ours) am
e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit '
c526e5d57b4f700370c7204e112e4e231aa3c482'
* commit '
c526e5d57b4f700370c7204e112e4e231aa3c482':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Christopher Tate [Thu, 5 Nov 2009 01:07:55 +0000 (17:07 -0800)]
am
9d45108a: am
888b702c: am
595596fe: Merge change I561011bc into eclair
Merge commit '
9d45108a5f341f426d2e5472e6c9319b8e482748'
* commit '
9d45108a5f341f426d2e5472e6c9319b8e482748':
Fix #
2176803 - restores from userdebug to user builds not working
Android (Google) Code Review [Thu, 5 Nov 2009 00:58:00 +0000 (19:58 -0500)]
Merge change I3bbfb4f9 into eclair
* changes:
Remove unused field and add new API to control the children drawing order.
Romain Guy [Wed, 4 Nov 2009 21:59:48 +0000 (13:59 -0800)]
Remove unused field and add new API to control the children drawing order.
Approved by: xav, hackbod, mcleron.
Change-Id: I3bbfb4f96e3c9adedbb68d78703059a2df1e2013
Eric Olsen [Thu, 5 Nov 2009 00:54:29 +0000 (16:54 -0800)]
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.
Daisuke Miyakawa [Thu, 5 Nov 2009 00:54:20 +0000 (16:54 -0800)]
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.
Eric Olsen [Thu, 5 Nov 2009 00:49:31 +0000 (16:49 -0800)]
am
9053fdb3: Merge change I76127f6f into eclair
Merge commit '
9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2
* commit '
9053fdb32b38d1240d856bd6efedf72eefba48d3':
Add support for colored LED on jogball backlight.
Android (Google) Code Review [Thu, 5 Nov 2009 00:45:14 +0000 (19:45 -0500)]
Merge change I76588b56 into eclair-mr2
* changes:
Make vCard importer handle "PAGER" phone number correctly.
Daisuke Miyakawa [Thu, 5 Nov 2009 00:43:19 +0000 (09:43 +0900)]
Make vCard importer handle "PAGER" phone number correctly.
Add tests for it.
Internal issue number:
2239492
Ying Wang [Thu, 5 Nov 2009 00:42:17 +0000 (16:42 -0800)]
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)
Christopher Tate [Thu, 5 Nov 2009 00:42:10 +0000 (16:42 -0800)]
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
Android (Google) Code Review [Thu, 5 Nov 2009 00:39:29 +0000 (19:39 -0500)]
Merge change I76127f6f into eclair
* changes:
Add support for colored LED on jogball backlight.
Ying Wang [Thu, 5 Nov 2009 00:35:15 +0000 (16:35 -0800)]
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)
Christopher Tate [Thu, 5 Nov 2009 00:35:06 +0000 (16:35 -0800)]
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
Ying Wang [Thu, 5 Nov 2009 00:18:04 +0000 (16:18 -0800)]
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)
Android (Google) Code Review [Thu, 5 Nov 2009 00:08:59 +0000 (19:08 -0500)]
Merge change Ib9cc041e into eclair-sdk
* changes:
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Ying Wang [Tue, 27 Oct 2009 18:00:30 +0000 (11:00 -0700)]
Explicitly specify that online-sdk depends on framework-res. (do not merge)
this is integrated from Eclair to fix the mac build breakages.
Android (Google) Code Review [Wed, 4 Nov 2009 23:52:27 +0000 (18:52 -0500)]
Merge change I561011bc into eclair
* changes:
Fix #
2176803 - restores from userdebug to user builds not working
Jason Parks [Wed, 4 Nov 2009 23:21:10 +0000 (15:21 -0800)]
am
3e1000b7: am
6176790e: am
ef16a545: Merge change I2867746d into eclair
Merge commit '
3e1000b706f92d229e473ae31f76643d82d5cdb9'
* commit '
3e1000b706f92d229e473ae31f76643d82d5cdb9':
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Mathias Agopian [Wed, 4 Nov 2009 23:20:59 +0000 (15:20 -0800)]
am
ba37ea55: am
6d9e0c7a: am
36fe3eea: part of fix [
2186418] switch passion to 24-bits framebuffer
Merge commit '
ba37ea550d97b753fc74049d22f5e752d4b0185f'
* commit '
ba37ea550d97b753fc74049d22f5e752d4b0185f':
part of fix [
2186418] switch passion to 24-bits framebuffer
Leon Scroggins [Wed, 4 Nov 2009 23:20:44 +0000 (15:20 -0800)]
am
ffb4eeb5: am
3613385f: Do not update the progress if it is the same as the last given progress.
Merge commit '
ffb4eeb54b90659cd95f89268eec47a509690d4c'
* commit '
ffb4eeb54b90659cd95f89268eec47a509690d4c':
Do not update the progress if it is the same as the last given progress.
Jason Parks [Wed, 4 Nov 2009 23:10:22 +0000 (15:10 -0800)]
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.
Mathias Agopian [Wed, 4 Nov 2009 23:10:13 +0000 (15:10 -0800)]
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
Leon Scroggins [Wed, 4 Nov 2009 23:10:05 +0000 (15:10 -0800)]
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.
Jason Parks [Wed, 4 Nov 2009 22:59:54 +0000 (14:59 -0800)]
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.
Mathias Agopian [Wed, 4 Nov 2009 22:59:44 +0000 (14:59 -0800)]
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
Android (Google) Code Review [Wed, 4 Nov 2009 22:54:00 +0000 (17:54 -0500)]
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.
Mathias Agopian [Wed, 4 Nov 2009 00:17:55 +0000 (16:17 -0800)]
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)
Leon Scroggins [Wed, 4 Nov 2009 22:02:03 +0000 (14:02 -0800)]
Do not update the progress if it is the same as the last given progress.
Dirk Dougherty [Wed, 4 Nov 2009 22:42:29 +0000 (14:42 -0800)]
am
5b40ead8: am
0d55daff: am
5fc71e67: am
00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '
5b40ead81bdd350c3f4a585d851d91e5bec0c5c6'
* commit '
5b40ead81bdd350c3f4a585d851d91e5bec0c5c6':
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Dirk Dougherty [Wed, 4 Nov 2009 22:32:34 +0000 (14:32 -0800)]
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.
Eric Olsen [Thu, 29 Oct 2009 23:42:03 +0000 (16:42 -0700)]
Add support for colored LED on jogball backlight.
Signed-off-by: Eric Olsen <eolsen@android.com>
Jason Parks [Wed, 4 Nov 2009 22:25:26 +0000 (14:25 -0800)]
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Dirk Dougherty [Wed, 4 Nov 2009 22:21:20 +0000 (14:21 -0800)]
am
5fc71e67: am
00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '
5fc71e67498ed64ad2d41c23471b008f93cb580e' into eclair-mr2
* commit '
5fc71e67498ed64ad2d41c23471b008f93cb580e':
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Dirk Dougherty [Wed, 4 Nov 2009 22:12:29 +0000 (14:12 -0800)]
am
00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '
00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair
* commit '
00e44ef21777f32b67a8d51ee375cd290a3fb2d4':
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Android (Google) Code Review [Wed, 4 Nov 2009 22:04:41 +0000 (17:04 -0500)]
Merge change I54545dfd into eclair-sdk
* changes:
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Mathias Agopian [Wed, 4 Nov 2009 21:46:42 +0000 (13:46 -0800)]
am
43606242: am
8e5e44e9: am
9a54d7dd: Merge change Ibbf945f3 into eclair
Merge commit '
4360624241251035534a46449e23be38d9e6b03c'
* commit '
4360624241251035534a46449e23be38d9e6b03c':
fix [
2236832] software OpenGL ES driver doesn't work on sholes
Brett Chabot [Wed, 4 Nov 2009 21:46:28 +0000 (13:46 -0800)]
am
dcef5348: am
8742696b: am
c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '
dcef5348f4457b20bcf29b8754a07160ea572372'
* commit '
dcef5348f4457b20bcf29b8754a07160ea572372':
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Jean-Michel Trivi [Wed, 4 Nov 2009 21:46:17 +0000 (13:46 -0800)]
am
bd38397b: am
3d2d155a: am
7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '
bd38397bc4f754c040d4abf5435c2469c3357924'
* commit '
bd38397bc4f754c040d4abf5435c2469c3357924':
Add new audio sources to support the A1026 recording configurations.
Christopher Tate [Wed, 4 Nov 2009 19:49:08 +0000 (11:49 -0800)]
Fix #
2176803 - restores from userdebug to user builds not working
The underlying issue is that ordinarily, the restore mechanism checks the
signature block of the package which uploaded the restore data against the
signature of the package on-device that will be handling the restore. This is
to ensure that the restore goes to the "same" application as the one that
uploaded it.
However, applications bundled on the system partition as part of the device
build are signed not with a permanent, app-identifying signature, but rather
with the device's signature block, which is different for each kind of device
and potentially between kinds of build for the same device. That renders the
stored backup data unusable when changing devices / builds / etc.
This change works around the problem by explicitly privileging applications that
reside on the system partition: they have been built into the device, and so
are trusted to be able to handle data that is marked as coming from its package
name.
Change-Id: I561011bce2b54cff3e695e82e7544b126b6ac31e
Mathias Agopian [Wed, 4 Nov 2009 21:23:36 +0000 (13:23 -0800)]
am
8e5e44e9: am
9a54d7dd: Merge change Ibbf945f3 into eclair
Merge commit '
8e5e44e9538fc327800414926651d46967ccc725' into eclair-mr2-plus-aosp
* commit '
8e5e44e9538fc327800414926651d46967ccc725':
fix [
2236832] software OpenGL ES driver doesn't work on sholes
Brett Chabot [Wed, 4 Nov 2009 21:23:28 +0000 (13:23 -0800)]
am
8742696b: am
c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '
8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp
* commit '
8742696b0d74f5dc45093d524d12fbb8abb76fa4':
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Jean-Michel Trivi [Wed, 4 Nov 2009 21:23:00 +0000 (13:23 -0800)]
am
3d2d155a: am
7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '
3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp
* commit '
3d2d155a87cdd3038a2e6df8741181431cb250e1':
Add new audio sources to support the A1026 recording configurations.
Mathias Agopian [Wed, 4 Nov 2009 21:14:59 +0000 (13:14 -0800)]
am
9a54d7dd: Merge change Ibbf945f3 into eclair
Merge commit '
9a54d7dddcbc982d644c627693dc39fb2cb5c0fb' into eclair-mr2
* commit '
9a54d7dddcbc982d644c627693dc39fb2cb5c0fb':
fix [
2236832] software OpenGL ES driver doesn't work on sholes
Android (Google) Code Review [Wed, 4 Nov 2009 20:45:39 +0000 (15:45 -0500)]
Merge change Ibbf945f3 into eclair
* changes:
fix [
2236832] software OpenGL ES driver doesn't work on sholes
Brett Chabot [Wed, 4 Nov 2009 20:05:45 +0000 (12:05 -0800)]
am
c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '
c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-mr2
* commit '
c20fc77c5a2bb8483f2e6e8b4064853804502365':
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Jean-Michel Trivi [Wed, 4 Nov 2009 20:05:34 +0000 (12:05 -0800)]
am
7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '
7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2
* commit '
7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
Add new audio sources to support the A1026 recording configurations.
Android (Google) Code Review [Wed, 4 Nov 2009 19:56:14 +0000 (14:56 -0500)]
Merge change Iefd4a388 into eclair
* changes:
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Andreas Huber [Wed, 4 Nov 2009 18:53:03 +0000 (10:53 -0800)]
am
84953593: am
ad278f22: Merge change I6bce6d87 into eclair-mr2
Merge commit '
8495359382bc7c94a776e51c596e807448796476'
* commit '
8495359382bc7c94a776e51c596e807448796476':
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
Andreas Huber [Wed, 4 Nov 2009 18:52:53 +0000 (10:52 -0800)]
am
7146332e: am
0533aade: Merge change I313953dc into eclair-mr2
Merge commit '
7146332e9999443e22296d6d0968f95b80e79af6'
* commit '
7146332e9999443e22296d6d0968f95b80e79af6':
Support raw audio sources in MediaPlayerImpl.
Andreas Huber [Wed, 4 Nov 2009 18:52:42 +0000 (10:52 -0800)]
am
66c25573: am
12bc3af0: Merge change I6f6bf3d8 into eclair-mr2
Merge commit '
66c2557334d6c8116c874aa65e84b280d325009e'
* commit '
66c2557334d6c8116c874aa65e84b280d325009e':
Support raw audio sources in stagefright commandline tool.
Andreas Huber [Wed, 4 Nov 2009 18:52:31 +0000 (10:52 -0800)]
am
5a58de8b: am
2f133015: Merge change I5126e183 into eclair-mr2
Merge commit '
5a58de8b3bb1b6cc5304f83c8a3d527f952b91de'
* commit '
5a58de8b3bb1b6cc5304f83c8a3d527f952b91de':
Fix MP3Extractor duration overflows...
Andreas Huber [Wed, 4 Nov 2009 18:43:01 +0000 (10:43 -0800)]
am
ad278f22: Merge change I6bce6d87 into eclair-mr2
Merge commit '
ad278f2276de23197571e486ad387dacc7f346ee' into eclair-mr2-plus-aosp
* commit '
ad278f2276de23197571e486ad387dacc7f346ee':
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
Andreas Huber [Wed, 4 Nov 2009 18:42:53 +0000 (10:42 -0800)]
am
0533aade: Merge change I313953dc into eclair-mr2
Merge commit '
0533aadef6d93dec868d648402f5ec326161de57' into eclair-mr2-plus-aosp
* commit '
0533aadef6d93dec868d648402f5ec326161de57':
Support raw audio sources in MediaPlayerImpl.
Andreas Huber [Wed, 4 Nov 2009 18:42:45 +0000 (10:42 -0800)]
am
12bc3af0: Merge change I6f6bf3d8 into eclair-mr2
Merge commit '
12bc3af0fb4ce17065d0f17982e0a9da52fc093d' into eclair-mr2-plus-aosp
* commit '
12bc3af0fb4ce17065d0f17982e0a9da52fc093d':
Support raw audio sources in stagefright commandline tool.
Andreas Huber [Wed, 4 Nov 2009 18:42:35 +0000 (10:42 -0800)]
am
2f133015: Merge change I5126e183 into eclair-mr2
Merge commit '
2f1330155153e590548e711d619765edc8ebb62f' into eclair-mr2-plus-aosp
* commit '
2f1330155153e590548e711d619765edc8ebb62f':
Fix MP3Extractor duration overflows...
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:27 +0000 (13:33 -0500)]
Merge change I6bce6d87 into eclair-mr2
* changes:
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:13 +0000 (13:33 -0500)]
Merge change I313953dc into eclair-mr2
* changes:
Support raw audio sources in MediaPlayerImpl.
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:02 +0000 (13:33 -0500)]
Merge change I6f6bf3d8 into eclair-mr2
* changes:
Support raw audio sources in stagefright commandline tool.
Android (Google) Code Review [Wed, 4 Nov 2009 18:32:46 +0000 (13:32 -0500)]
Merge change I5126e183 into eclair-mr2
* changes:
Fix MP3Extractor duration overflows...
Android (Google) Code Review [Wed, 4 Nov 2009 16:49:25 +0000 (11:49 -0500)]
Merge change I6869df3a into eclair
* changes:
Add new audio sources to support the A1026 recording configurations.
Mike Lockwood [Wed, 4 Nov 2009 14:30:27 +0000 (06:30 -0800)]
am
7efae9ae: am
6de8bbb0: am
27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '
7efae9ae50923ebe1bd1b50c0397220b8f0d642f'
* commit '
7efae9ae50923ebe1bd1b50c0397220b8f0d642f':
PowerManagerService: Fix manual brightness mode.
Romain Guy [Wed, 4 Nov 2009 14:30:18 +0000 (06:30 -0800)]
am
b1c9068f: am
1503f739: am
e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit '
b1c9068fa4763547ac35e632077ac40456361065'
* commit '
b1c9068fa4763547ac35e632077ac40456361065':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Mike Lockwood [Wed, 4 Nov 2009 14:19:50 +0000 (06:19 -0800)]
am
6de8bbb0: am
27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '
6de8bbb00a6183c7d4eec76fa7f253cf80736422' into eclair-mr2-plus-aosp
* commit '
6de8bbb00a6183c7d4eec76fa7f253cf80736422':
PowerManagerService: Fix manual brightness mode.
Romain Guy [Wed, 4 Nov 2009 14:19:43 +0000 (06:19 -0800)]
am
1503f739: am
e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit '
1503f739f8a22822fa969c516564063ef46db52a' into eclair-mr2-plus-aosp
* commit '
1503f739f8a22822fa969c516564063ef46db52a':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Mike Lockwood [Wed, 4 Nov 2009 14:10:37 +0000 (06:10 -0800)]
am
27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '
27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-mr2
* commit '
27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
PowerManagerService: Fix manual brightness mode.
Romain Guy [Wed, 4 Nov 2009 14:10:26 +0000 (06:10 -0800)]
am
e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit '
e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-mr2
* commit '
e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Mike Lockwood [Wed, 4 Nov 2009 13:57:07 +0000 (08:57 -0500)]
PowerManagerService: Fix manual brightness mode.
Change-Id: I10aec64e3f7ae2715475b9797565747295c19a00
Signed-off-by: Mike Lockwood <lockwood@android.com>
Daisuke Miyakawa [Wed, 4 Nov 2009 13:12:40 +0000 (05:12 -0800)]
am
ffe9b571: am
f035b477: Make test compontent support multiple vCard input.
Merge commit '
ffe9b571bc8f299ac9198e00741c612dbd8d5934'
* commit '
ffe9b571bc8f299ac9198e00741c612dbd8d5934':
Make test compontent support multiple vCard input.
Daisuke Miyakawa [Wed, 4 Nov 2009 13:02:50 +0000 (05:02 -0800)]
am
f035b477: Make test compontent support multiple vCard input.
Merge commit '
f035b47774aabf7397aec5c5459ac9860ad63bab' into eclair-mr2-plus-aosp
* commit '
f035b47774aabf7397aec5c5459ac9860ad63bab':
Make test compontent support multiple vCard input.
Daisuke Miyakawa [Wed, 4 Nov 2009 02:41:50 +0000 (11:41 +0900)]
Make test compontent support multiple vCard input.
Internal issue number:
2195990