13394 Commits

Author SHA1 Message Date
Daisuke Miyakawa
87ec42a5fc am 7557e547: am 5dbeef6e: Merge change I76588b56 into eclair-mr2
Merge commit '7557e54700d266f6c44a4ed5c13c52a67599cbe3'

* commit '7557e54700d266f6c44a4ed5c13c52a67599cbe3':
  Make vCard importer handle "PAGER" phone number correctly.
2009-11-04 17:08:16 -08:00
Ying Wang
cf8b12dd6a 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)
2009-11-04 17:08:06 -08:00
Christopher Tate
c48fc8912c 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
2009-11-04 17:07:55 -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
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
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
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
ba986b1acb 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.
2009-11-04 15:21:10 -08:00
Mathias Agopian
9ac8e3c609 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
2009-11-04 15:20:59 -08:00
Leon Scroggins
486cbdc8e1 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.
2009-11-04 15:20:44 -08: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
51bde0577c 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.
2009-11-04 14:42:29 -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
Jason Parks
2867746d7b 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:25:26 -08:00
Dirk Dougherty
0d55daffc3 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.
2009-11-04 14:21:20 -08:00
Dirk Dougherty
5fc71e6749 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.
2009-11-04 14:12:29 -08:00
Android (Google) Code Review
00e44ef217 Merge change I54545dfd into eclair-sdk
* changes:
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 17:04:41 -05:00
Mathias Agopian
c92ed49ba6 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
2009-11-04 13:46:42 -08:00
Brett Chabot
a7dd26bf61 am dcef5348: am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit 'dcef5348f4457b20bcf29b8754a07160ea572372'

* commit 'dcef5348f4457b20bcf29b8754a07160ea572372':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 13:46:28 -08:00
Jean-Michel Trivi
fc078b1307 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.
2009-11-04 13:46:17 -08:00
Christopher Tate
78dd4a7371 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
2009-11-04 13:27:56 -08:00
Mathias Agopian
4360624241 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
2009-11-04 13:23:36 -08:00
Brett Chabot
dcef5348f4 am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp

* commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 13:23:28 -08:00
Jean-Michel Trivi
bd38397bc4 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.
2009-11-04 13:23:00 -08:00
Mathias Agopian
8e5e44e953 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
2009-11-04 13:14:59 -08:00
Android (Google) Code Review
9a54d7dddc Merge change Ibbf945f3 into eclair
* changes:
  fix [2236832] software OpenGL ES driver doesn't work on sholes
2009-11-04 15:45:39 -05:00
Brett Chabot
8742696b0d am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-mr2

* commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 12:05:45 -08:00
Jean-Michel Trivi
3d2d155a87 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.
2009-11-04 12:05:34 -08:00
Android (Google) Code Review
c20fc77c5a Merge change Iefd4a388 into eclair
* changes:
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 14:56:14 -05:00
Andreas Huber
b4ff8629af 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.
2009-11-04 10:53:03 -08:00
Andreas Huber
afd80d96c5 am 7146332e: am 0533aade: Merge change I313953dc into eclair-mr2
Merge commit '7146332e9999443e22296d6d0968f95b80e79af6'

* commit '7146332e9999443e22296d6d0968f95b80e79af6':
  Support raw audio sources in MediaPlayerImpl.
2009-11-04 10:52:53 -08:00
Andreas Huber
9aaa59076a am 66c25573: am 12bc3af0: Merge change I6f6bf3d8 into eclair-mr2
Merge commit '66c2557334d6c8116c874aa65e84b280d325009e'

* commit '66c2557334d6c8116c874aa65e84b280d325009e':
  Support raw audio sources in stagefright commandline tool.
2009-11-04 10:52:42 -08:00
Andreas Huber
79d4002734 am 5a58de8b: am 2f133015: Merge change I5126e183 into eclair-mr2
Merge commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de'

* commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de':
  Fix MP3Extractor duration overflows...
2009-11-04 10:52:31 -08:00
Andreas Huber
8495359382 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.
2009-11-04 10:43:01 -08:00
Andreas Huber
7146332e99 am 0533aade: Merge change I313953dc into eclair-mr2
Merge commit '0533aadef6d93dec868d648402f5ec326161de57' into eclair-mr2-plus-aosp

* commit '0533aadef6d93dec868d648402f5ec326161de57':
  Support raw audio sources in MediaPlayerImpl.
2009-11-04 10:42:53 -08:00
Andreas Huber
66c2557334 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.
2009-11-04 10:42:45 -08:00