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

98336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
65dcf5322f am 44080524: Merge "Remove C++11 related warning" 
* commit '44080524f083dc00704267a0919016388f0d5426':
  Remove C++11 related warning
 2013-01-03 13:13:40 -08:00
Romain Guy
44080524f0 Merge "Remove C++11 related warning" 2013-01-03 13:10:23 -08:00
Romain Guy
dcfc836b45 Remove C++11 related warning 
Change-Id: I250ff7bd0ea49908e11b14c995d77312cd09a8b4
 2013-01-03 13:08:57 -08:00
Christopher Tate
066b036cd6 am f947930e: Merge "Document ContentProvider\'s API a bit more explicitly" 
* commit 'f947930ed2e7aa4b7cc9f2d9aad0b25ef002c0c7':
  Document ContentProvider's API a bit more explicitly
 2013-01-03 12:26:25 -08:00
Christopher Tate
f947930ed2 Merge "Document ContentProvider's API a bit more explicitly" 2013-01-03 12:22:53 -08:00
Christopher Tate
2bc6eb8c17 Document ContentProvider's API a bit more explicitly 
In particular, call out parameters that must not be null.

Change-Id: I67af73163e36efefefa7df86499937f998be5b00
 2013-01-03 12:16:54 -08:00
Scott Main
1355a436f8 am 0b8b0deb: am 36687030: am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '0b8b0deba92e9a877f921b9f1091c296cf67049a':
  docs: dashboard update for 1/3/13
 2013-01-03 12:00:07 -08:00
Scott Main
0b8b0deba9 am 36687030: am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '3668703021cc2f010d90d6194ca57456c9e11dbc':
  docs: dashboard update for 1/3/13
 2013-01-03 11:56:57 -08:00
Scott Main
3668703021 am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit 'cd7b6a947060dfa3da58acbba039274103077757':
  docs: dashboard update for 1/3/13
 2013-01-03 11:54:51 -08:00
Scott Main
cd7b6a9470 am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '7b31032051f430e03ac05503410b687fd289bdc3':
  docs: dashboard update for 1/3/13
 2013-01-03 11:51:27 -08:00
Scott Main
7b31032051 am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '90c0548c057f0c26c4dcd215ee64e787460c4c6e':
  docs: dashboard update for 1/3/13
 2013-01-03 11:49:45 -08:00
Scott Main
90c0548c05 am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '9fe82f1bc7c880bb1ec5ac3a9a1b5fff2c0bdda9':
  docs: dashboard update for 1/3/13
 2013-01-03 11:47:20 -08:00
Scott Main
9fe82f1bc7 Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 2013-01-03 11:44:43 -08:00
Scott Main
b318318e0a docs: dashboard update for 1/3/13 
Change-Id: I0ff0b045d1c08a071fa706d8c0ff17943f2e752f
 2013-01-03 11:39:34 -08:00
Jean-Michel Trivi
045ad18fa5 am e0c93e08: Merge "Use playback state to update remote control stack" 
* commit 'e0c93e085ff79b0adedfb7c316c395b9e06581f9':
  Use playback state to update remote control stack
 2013-01-03 11:17:37 -08:00
Jean-Michel Trivi
e0c93e085f Merge "Use playback state to update remote control stack" 2013-01-03 11:14:41 -08:00
Xavier Ducrohet
c0d1d76f0a am 69d8980f: (-s ours) 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 '69d8980f636b48acb211bc1211357ed4e4760cde':
  Add single crunch command to aapt. do not merge.
 2013-01-03 10:56:58 -08:00
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
Victoria Lease
f3dbb1afc9 am fc63d7de: am 380b45b8: am 73e243c4: Merge "Fix logging typos in GpsLocationProvider" 
* commit 'fc63d7de88e068c172990ef5ff0906ba7689c04f':
  Fix logging typos in GpsLocationProvider
 2013-01-02 16:39:14 -08:00
Jason Sams
6337499dfb am 09e2835f: Fix off by 1 in color cube. 
* commit '09e2835fada76f11a68b00cacba123d7d0649d66':
  Fix off by 1 in color cube.
 2013-01-02 16:36:33 -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
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
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
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
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
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