98275 Commits

Author SHA1 Message Date
Xavier Ducrohet
69d8980f63 am 5d004211: (-s ours) am e92b9706: am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.
* commit '5d00421157febf6e6be4e9abc0ac95549f5b9405':
  Add single crunch command to aapt. do not merge.
2013-01-03 10:55:03 -08:00
Xavier Ducrohet
5d00421157 am e92b9706: am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.
* commit 'e92b9706df09730e60c1e9ae17d4157c2c118825':
  Add single crunch command to aapt. do not merge.
2013-01-03 10:52:37 -08:00
Xavier Ducrohet
e92b9706df am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.
* commit '816fd074cfc32fd3323163dd0c358e249f9cbf56':
  Add single crunch command to aapt. do not merge.
2013-01-03 10:49:28 -08:00
Xavier Ducrohet
816fd074cf am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.
* commit 'afa4d8bfafdd42b75dc15d31c0962c252f304138':
  Add single crunch command to aapt. do not merge.
2013-01-03 10:46:34 -08:00
Xavier Ducrohet
afa4d8bfaf am 22d7cf23: Add single crunch command to aapt. do not merge.
* commit '22d7cf239d8a9b009ea7adf86d8826a8a8116d03':
  Add single crunch command to aapt. do not merge.
2013-01-03 10:43:39 -08:00
Jim Miller
8ca2fc10ce Remove unused keyguard code
This change removes the old keyguard code because it's obsolete and doesn't run
anymore.

Change-Id: I8ed93f507378a17cf834d2ee9284c098eb8efffe
2013-01-02 17:07:56 -08:00
Victoria Lease
fc63d7de88 am 380b45b8: am 73e243c4: Merge "Fix logging typos in GpsLocationProvider"
* commit '380b45b805c07a9df3135bc009dcde7b0b96b73f':
  Fix logging typos in GpsLocationProvider
2013-01-02 16:35:01 -08:00
Jason Sams
09e2835fad Fix off by 1 in color cube.
Tested with 2x2x2 and 32x32x16 cubes.
Bit exact in 2x2x2

Change-Id: I0ca3e3736d1d9c611a02bba8ee9bfea3befd0e76
2013-01-02 16:22:59 -08:00
Jason Sams
18483a482a Merge "Cleanup imports." 2013-01-02 16:14:21 -08:00
Jason Sams
256377e746 Merge "yuv" 2013-01-02 16:10:53 -08:00
Xavier Ducrohet
22d7cf239d Add single crunch command to aapt. do not merge.
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)

Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
2013-01-02 15:41:52 -08:00
Victoria Lease
380b45b805 am 73e243c4: Merge "Fix logging typos in GpsLocationProvider"
* commit '73e243c4d271907d10f10b301b2d6854e1f63fe4':
  Fix logging typos in GpsLocationProvider
2013-01-02 14:46:48 -08:00
Victoria Lease
73e243c4d2 Merge "Fix logging typos in GpsLocationProvider" 2013-01-02 14:15:51 -08:00
Uma Maheswari Ramalingam
ec7f4a6953 frameworks/base: Support for LTE network modes
Change-Id: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
2013-01-02 14:05:58 -08:00
Christopher Tate
116751d84f Shrink Bundle.getString(key, default) and getCharSequence(key, default)
They previously duplicated the full logic of getString(key) and
getCharSequence(key) independently.  Now they both use the no-default
version internally,  resulting both in a single point of implementation
for test & isolation purposes and in a (small) decrease in code size.

Change-Id: If1b1e1fa4a549a0ec4cf221e54998f4fd438f3a2
2013-01-02 14:01:03 -08:00
Baligh Uddin
cac9bbd7f5 Merge "Import translations. DO NOT MERGE" 2013-01-02 13:40:11 -08:00
Victoria Lease
b1c7508227 Merge "prevent concurrency issues during LocationManager init" 2013-01-02 13:37:39 -08:00
Baligh Uddin
e06c046df3 Merge "Import translations. DO NOT MERGE" 2013-01-02 13:33:23 -08:00
Victoria Lease
5cd731a233 prevent concurrency issues during LocationManager init
systemReady() was returning before the LocationManagerService was
actually ready. Applications making LocationManager transactions
during their startup could possibly hit a race condition with the
yet-uninitialised LocationManagerService.

To guarantee that LocationManagerService is actually ready before
returning from systemReady(), we simply do the startup work on the
thread that called systemReady(), rather than spin up a secondary
thread to do the work asynchronously.

LocationWorkerHandler still needs a thread to do its work on, so
rather than have it run on the secondary thread that was
previously used for systemReady()'s work, we create a HandlerThread
for it.

Additionally, LocationManagerService.init() really needed to grab
lock for some of the things it was doing. I moved all of the code
that could benefit from mutex protection to a single section of
systemReady() and wrapped it up with a lock while I was at it.

Bug: 7723944
Change-Id: I51d480e2781622c3a14769c3a2019a2407dcfd8a
2013-01-02 13:25:57 -08:00
Xavier Ducrohet
6fb9a983ce Merge "Add single crunch command to aapt." 2013-01-02 12:55:45 -08:00
Jean-Michel Trivi
a578c48e6c Use playback state to update remote control stack
The remote control stack in AudioService is responsible for handling
 which application receives media button events. When an application
 "registers" its media button receiver, it gets placed at the top
 of the remote control stack. If the app also has audio focus (is
 at top of focus stack), this will also cause the information of
 the attached remote control client (RCC) to be displayed on the
 lockscreen.
If an app doesn't re-register its button receiver when it wants
 to receive the button events, it might have lost its place at the
 top of the remote control stack, and would not show up in the
 lockscreen anymore.
This change consists in using the playstate reported by the RCC
 to change the remote control stack. If an RCC reports a "playing"
 state (e.g. playing, fast forwarding), it is safe to assume the
 application is actively being used, and should be the one that
 receives the transport control buttons. This CL uses the reported
 playstate to conditionally move the corresponding stack entry
 to the top of the stack.

Bug 7311023

Change-Id: I1505f01664c16e108b22d33e3f47f0056343676e
2013-01-02 12:31:56 -08:00
Jean-Michel Trivi
84aa61e2a8 Optimize remote control stack traversal order
Iterate of remote control stack entries from the top of the stack
 for cases where the condition being checked is more likely at
 the top of the stack, as opposed to the bottom, which is first
 accessed when using an iterator.

Change-Id: I625bee59021c2d652e9d6355b48dc0c11e36093f
2013-01-02 12:17:43 -08:00
Jean-Michel Trivi
383f36cf64 Merge "Add comments on remote control stack traversal order" 2013-01-02 12:15:45 -08:00
Baligh Uddin
9253122b13 Import translations. DO NOT MERGE
Change-Id: Id2fc7ebb708403110bd12d46f21f2d110e5d75a7
Auto-generated-cl: translation import
2013-01-02 12:15:44 -08:00
Jean-Michel Trivi
66cbd19737 Add comments on remote control stack traversal order
Add comments to justify where remote control stack traversal order
 doesn't matter.

Change-Id: I71a71ae22446cee529649e047142c774f78a377b
2013-01-02 12:11:15 -08:00
Baligh Uddin
daee444985 Import translations. DO NOT MERGE
Change-Id: I1c079aea9c2876b743d8b4fbc409e7624e0818c6
Auto-generated-cl: translation import
2013-01-02 12:06:25 -08:00
Jason Sams
ef308ed9b3 Cleanup imports.
Change-Id: I72690651e895ad7bafa57ccc7261eaa1168923bd
2013-01-02 11:20:29 -08:00
Jason Sams
8140d7b0f6 yuv
Change-Id: I3e99740250f1a3cb356bf6906528abc71f8cee2e
2013-01-02 11:20:29 -08:00
Jean-Michel Trivi
d6a7925d14 Merge "Updates to remote control client (un)registration" 2013-01-02 11:05:08 -08:00
Jean-Michel Trivi
f2fc1cbb06 Merge "Fix stack traversal order when removing or adding media button receiver" 2013-01-02 10:56:35 -08:00
Xavier Ducrohet
b1f6ad82dd Add single crunch command to aapt.
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

Change-Id: I635ee3e871d035b9db2fb593802d914e48241abf
2013-01-02 10:30:25 -08:00
Amith Yamasani
4c7f809dd5 am ff0cb373: am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation"
* commit 'ff0cb3737b2f4f2e0762468f8424bba8a5681faf':
  Fixed typo in Recreating an Activity documentation
2013-01-02 10:08:41 -08:00
Amith Yamasani
ff0cb3737b am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation"
* commit '554ed0f0347acc568ab1e73621789423c953f693':
  Fixed typo in Recreating an Activity documentation
2013-01-02 10:03:21 -08:00
Siva Velusamy
af80cdd7df Merge "DdmServer: add controls for OpenGL tracing" 2013-01-02 09:10:06 -08:00
Amith Yamasani
554ed0f034 Merge "Fixed typo in Recreating an Activity documentation" 2013-01-02 09:00:28 -08:00
Jason Sams
a22f980f99 Merge "Fix color cube tests." 2012-12-28 14:37:44 -08:00
Jason Sams
ddf66ce679 Fix color cube tests.
Change-Id: I644ac26c6d234bf5b9cf4c549bebdfee67e98f50
2012-12-28 13:24:03 -08:00
Jason Sams
69bf687e53 Merge "Add API support for 3D allocations." 2012-12-28 11:53:46 -08:00
Elliott Hughes
e2d3156bad am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak"
* commit '2fbc67abb9c79df942e0bbff118017d6d2476cbf':
  StringBlock_nativeCreate: Possible Leak
2012-12-28 09:48:23 -08:00
Scott Main
704cbbcd1d am 1a9c5a5f: am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev
* commit '1a9c5a5f82786825937c0a4d46457f336cba8f97':
  docs: add class on keyboards
2012-12-28 09:48:14 -08:00
Scott Main
e3d1258082 am 51627153: am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
* commit '51627153b9e6c26d5d2d87ee14ca0676968578e5':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
2012-12-28 09:48:09 -08:00
James Dong
f3ec15425f am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"
* commit 'edde28fd0956d941e4962e3228f3030e203da4aa':
  Handle errors from AudioEffect::queryNumberEffects
2012-12-28 09:47:46 -08:00
James Dong
cf1df19448 am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore"
* commit '0c1e566f97a39dd79e563afe953de8879ef66bd9':
  Set "isdrm" info in Mediastore
2012-12-28 09:47:41 -08:00
The Android Open Source Project
b3c81e3f6c am 57ebeed6: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '57ebeed61fd7b1a8fb8d1d8d719c10dfabd8aae4':
2012-12-28 09:47:35 -08:00
kmccormick@google.com
8d3a44bcb0 am 12f2f8dc: am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev
* commit '12f2f8dcd79fc1952b3d606829857b0df4398fa8':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
2012-12-28 09:47:28 -08:00
Irfan Sheriff
fa28d45d59 am 7f93e7d2: am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced."
* commit '7f93e7d265509d4ae18f99cbc9a45cca087c4b71':
  NsdService: Clear client info after resolution request is serviced.
2012-12-28 09:47:03 -08:00
Jean-Michel Trivi
246f4529bb Merge "Remove unused audio source" 2012-12-28 08:46:50 -08:00
Jason Sams
d1c306a9e6 Add API support for 3D allocations.
Change-Id: I19c525f90135d83caec545e77e8f61a957d220ee
2012-12-27 20:26:41 -08:00
Jean-Michel Trivi
58a9cad4e8 Remove unused audio source
Bug 7110996

Change-Id: I90737c14a4e6f9fe662eb7eb5bd0483da823083b
2012-12-27 15:31:47 -08:00
Jean-Michel Trivi
ed2d10dab7 Updates to remote control client (un)registration
Iterate over the remote control stack from top to bottom
 when (un)registering a remote control client (RCC).
When unregistering an RCC, stop traversing the stack when
 match found. If match was at top of the stack, update
 the remote control display (RCD).

Change-Id: If64acf102bdf328085d707f9e0f7e86cf4d4001a
2012-12-27 09:43:46 -08:00