drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,305 Commits 1 Branch 0 Tags
cdb87536f5
Commit Graph

98305 Commits

Author SHA1 Message Date
Jason Sams
cdb87536f5 am 18483a48: Merge "Cleanup imports." 
* commit '18483a482a129276f462bbcccf9dbad21b29a4bd':
  Cleanup imports.
 2013-01-02 16:18:48 -08:00
Jason Sams
18483a482a Merge "Cleanup imports." 2013-01-02 16:14:21 -08:00
Jason Sams
232f4214cf am 256377e7: Merge "yuv" 
* commit '256377e7469a6fbc930727a19ea4a00ca886d6dd':
  yuv
 2013-01-02 16:14:06 -08:00
Jason Sams
256377e746 Merge "yuv" 2013-01-02 16:10:53 -08:00
Baligh Uddin
e5caa0ec6b am cac9bbd7: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'cac9bbd7f56904f95ecd4805b135dc23c9979e99':
  Import translations. DO NOT MERGE
 2013-01-02 13:42:33 -08:00
Victoria Lease
e712300d68 am b1c75082: Merge "prevent concurrency issues during LocationManager init" 
* commit 'b1c7508227620de9b184ac25b4a1b9f45155111b':
  prevent concurrency issues during LocationManager init
 2013-01-02 13:42:30 -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
c5fe7a74fe am e06c046d: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'e06c046df384d70b4b979fda8e83a330770b102c':
  Import translations. DO NOT MERGE
 2013-01-02 13:35: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
b71f5b3c9a am 6fb9a983: Merge "Add single crunch command to aapt." 
* commit '6fb9a983cefd9d0b75c2c68c161c03667afe339e':
  Add single crunch command to aapt.
 2013-01-02 12:57:53 -08:00
Xavier Ducrohet
6fb9a983ce Merge "Add single crunch command to aapt." 2013-01-02 12:55:45 -08:00
Jean-Michel Trivi
0f617ba82c am 84aa61e2: Optimize remote control stack traversal order 
* commit '84aa61e2a838fdeb7484ffaf95945a205bccb453':
  Optimize remote control stack traversal order
 2013-01-02 12:22:50 -08:00
Jean-Michel Trivi
1bb23b6cd5 am 383f36cf: Merge "Add comments on remote control stack traversal order" 
* commit '383f36cf64d81ccda1aaa7cbf49377a930e02235':
  Add comments on remote control stack traversal order
 2013-01-02 12:19:04 -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
a2e8c661ec am d6a7925d: Merge "Updates to remote control client (un)registration" 
* commit 'd6a7925d14231c016e84db53fb5a5bbab5a07d84':
  Updates to remote control client (un)registration
 2013-01-02 11:08:31 -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
dabff6efce am f2fc1cbb: Merge "Fix stack traversal order when removing or adding media button receiver" 
* commit 'f2fc1cbb067eb12eccb23c5469814675539e28a6':
  Fix stack traversal order when removing or adding media button receiver
 2013-01-02 11:00:02 -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
b2e5c59513 am 4c7f809d: am ff0cb373: am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation" 
* commit '4c7f809dd5c934b86b0450e59941998aeb7fb96e':
  Fixed typo in Recreating an Activity documentation
 2013-01-02 10:10:43 -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
360b4d9418 am af80cdd7: Merge "DdmServer: add controls for OpenGL tracing" 
* commit 'af80cdd7dfa28158fa91ab374d8e6d2500de66b1':
  DdmServer: add controls for OpenGL tracing
 2013-01-02 09:14:06 -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
1c7a510cb6 am a22f980f: Merge "Fix color cube tests." 
* commit 'a22f980f993876570eab8297d3c2207c7fe3d65e':
  Fix color cube tests.
 2012-12-28 14:40:52 -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
41cc867fda am 69bf687e: Merge "Add API support for 3D allocations." 
* commit '69bf687e5335db07d32fd68438ff64e18b9e9e8a':
  Add API support for 3D allocations.
 2012-12-28 11:57:37 -08:00
Jason Sams
69bf687e53 Merge "Add API support for 3D allocations." 2012-12-28 11:53:46 -08:00
Elliott Hughes
616e19ff51 am e2d3156b: am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak" 
* commit 'e2d3156badd95ecb1b4f6e4b07f4e3acf2f5dffa':
  StringBlock_nativeCreate: Possible Leak
 2012-12-28 09:59:26 -08:00
Scott Main
27dfd013ab am 704cbbcd: am 1a9c5a5f: am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '704cbbcd1d821bb30d598a1637ae6e15202cea94':
  docs: add class on keyboards
 2012-12-28 09:59:23 -08:00
Scott Main
0f1f0a7b49 am e3d12580: 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 'e3d1258082883d9092ec5c3653c3dd81343f9d14':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-28 09:59:20 -08:00
James Dong
38a2758e50 am f3ec1542: am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects" 
* commit 'f3ec15425fcd828586d3bbcea7ceffd75012f7a4':
  Handle errors from AudioEffect::queryNumberEffects
 2012-12-28 09:59:17 -08:00
James Dong
6354a1989f am cf1df194: am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore" 
* commit 'cf1df1944832d43aa95d3d8f6a84bea31096ad65':
  Set "isdrm" info in Mediastore
 2012-12-28 09:59:14 -08:00
The Android Open Source Project
53bdd7113f am b3c81e3f: (-s ours) am 57ebeed6: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'b3c81e3f6c3d41ab6220ba91808b04d758dccba1':
 2012-12-28 09:59:12 -08:00
kmccormick@google.com
6c4f94886c am 8d3a44bc: am 12f2f8dc: am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '8d3a44bcb09a5a68d1f00a49db02b306633b2ea7':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-28 09:59:08 -08:00
Irfan Sheriff
f20d11dfa8 am fa28d45d: am 7f93e7d2: am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit 'fa28d45d59cd00163dad560eb3f9c1ed6d6651a0':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-28 09:59:06 -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