Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,861 Commits 3 Branches 0 Tags
20777fae8757036d7d526cf74673d30993b77ac5
Commit Graph

9861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 (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
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
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
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
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
Eric Olsen
f42f15cf45 Add support for colored LED on jogball backlight. 
Signed-off-by: Eric Olsen <eolsen@android.com>
 2009-11-04 14:31:26 -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
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
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
Android (Google) Code Review
ad278f2276 Merge change I6bce6d87 into eclair-mr2 
* changes:
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
 2009-11-04 13:33:27 -05:00
Android (Google) Code Review
0533aadef6 Merge change I313953dc into eclair-mr2 
* changes:
  Support raw audio sources in MediaPlayerImpl.
 2009-11-04 13:33:13 -05:00
Android (Google) Code Review
12bc3af0fb Merge change I6f6bf3d8 into eclair-mr2 
* changes:
  Support raw audio sources in stagefright commandline tool.
 2009-11-04 13:33:02 -05:00
Android (Google) Code Review
2f13301551 Merge change I5126e183 into eclair-mr2 
* changes:
  Fix MP3Extractor duration overflows...
 2009-11-04 13:32:46 -05:00
Android (Google) Code Review
7ed0ceeba5 Merge change I6869df3a into eclair 
* changes:
  Add new audio sources to support the A1026 recording configurations.
 2009-11-04 11:49:25 -05:00
Mike Lockwood
6de8bbb00a am 27c6dd7a: PowerManagerService: Fix manual brightness mode. 
Merge commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-mr2

* commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
  PowerManagerService: Fix manual brightness mode.
 2009-11-04 06:10:37 -08:00
Romain Guy
1503f739f8 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.
 2009-11-04 06:10:26 -08:00
Mike Lockwood
27c6dd7aa4 PowerManagerService: Fix manual brightness mode. 
Change-Id: I10aec64e3f7ae2715475b9797565747295c19a00
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-04 08:57:07 -05:00
Daisuke Miyakawa
f035b47774 Make test compontent support multiple vCard input. 
Internal issue number: 2195990
 2009-11-04 21:51:54 +09:00
Mathias Agopian
bbf945f3c0 fix [2236832] software OpenGL ES driver doesn't work on sholes 
make sure to not pass our fake handles to the real gralloc
 2009-11-03 21:08:06 -08:00
Jean-Michel Trivi
6869df3a5d Add new audio sources to support the A1026 recording configurations. 2009-11-03 19:43:21 -08:00
Romain Guy
e1e0dc8e6e Make sure we relayout the TextView when the text changes and marquee is enabled. 
Bug #2192881.

Change-Id: Iffc2d15947a11974d9dc175740e3a5489cd43d21
 2009-11-03 17:24:55 -08:00