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

126918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
852750b321 am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '537ea90e554946ccb05af321e19df3a3fb377d2a':
  Import translations. DO NOT MERGE
 2014-03-27 22:15:45 +00:00
Selim Cinek
b6e077dcbe am 7718fc12: Fixed crash when setting wallpaper with built in rotation 
* commit '7718fc1291c73576417f0c25d88f5105f7ae7365':
  Fixed crash when setting wallpaper with built in rotation
 2014-03-27 22:15:37 +00:00
Brian Carlstrom
bea6517da9 am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'e0b94d1cf16c11406554edd035c7e1bef6d2b844':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-27 22:15:24 +00:00
John Reck
3d98c1f916 am 9eaf763a: Merge "Force-enable hardware acceleration for apps" 
* commit '9eaf763aa89a96e503000069f04b6569b4ad66b0':
  Force-enable hardware acceleration for apps
 2014-03-27 22:14:25 +00:00
Baligh Uddin
7e90512771 am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'de11c26060d0ed58ea40cefa2e45b7a14fb65d36':
  Import translations. DO NOT MERGE
 2014-03-27 22:14:24 +00:00
Adam Lesinski
8681280a62 am 891a1f34: am 587e420e: am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt" 
* commit '891a1f343dd0a2cdfd904fcf4a1eb0e1538c2183':
  Reduce warning verbosity in aapt
 2014-03-27 22:14:22 +00:00
Leon Scroggins
971f4ae10d am 3dbeca17: Merge "Remove SkOmxPixelRef to fix build." 
* commit '3dbeca1799421d1fcdfab80ebb44589accd7a791':
  Remove SkOmxPixelRef to fix build.
 2014-03-27 22:14:19 +00:00
Baligh Uddin
e19eb2872d am f8bc9e3b: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'f8bc9e3b6ade520729aa303d4f914c9362038593':
  Import translations. DO NOT MERGE
 2014-03-27 22:14:16 +00:00
Baligh Uddin
424bd6ff3a am 70039b67: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '70039b67a51120881aa8f22a24096b9a2bfa1336':
  Import translations. DO NOT MERGE
 2014-03-27 22:14:14 +00:00
Marco Nelissen
7d97fd4e42 am f0d019c4: Merge "Make setServer() safe to call multiple times" 
* commit 'f0d019c4e4ef5ec9b03330c8441aa1356036cc60':
  Make setServer() safe to call multiple times
 2014-03-27 22:14:11 +00:00
Craig Mautner
5d342522a0 am a79501cd: am af89d7e2: am bffd4d43: Merge "Check return values for null." into klp-modular-dev 
* commit 'a79501cd3843149f0759bd53d310cf97d4ee1c8d':
  Check return values for null.
 2014-03-27 22:14:08 +00:00
Scott Main
9f0b5bed28 am f5f47eab: am 653aa40e: am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit 'f5f47eab393c8b944c0dcc87fc207b5aa1593151':
  update viewport variable with new underscore format
 2014-03-27 22:14:06 +00:00
Christopher Tate
09368e0af1 am 450e63af: Merge "Unlinked providers STILL shouldn\'t cause crashes" 
* commit '450e63af4e5e434faef7c0c250ed10a00139eec9':
  Unlinked providers STILL shouldn't cause crashes
 2014-03-27 22:14:03 +00:00
Craig Mautner
a2f04a8e88 am 9410f598: am 723f7bbc: am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity" 
* commit '9410f5983b2fab4bac220dab0fab7cde10e6d34a':
  Do not show Home behind full screen activity
 2014-03-27 22:13:59 +00:00
Christopher Tate
03340735a4 am 5454ac6b: Merge "Expand install observer semantics" 
* commit '5454ac6b3754685210ac4dd790d24dad70bc2801':
  Expand install observer semantics
 2014-03-27 22:13:57 +00:00
Leon Scroggins
904f3ec875 am 4a857b1d: Merge "Update framework to use M34 version of Skia." 
* commit '4a857b1d471a51ed5dc0ad27fb2ab62ab78822e0':
  Update framework to use M34 version of Skia.
 2014-03-27 22:13:54 +00:00
Scott Main
5c421bd5d6 am 9ad8a533: am 9a5c6e68: am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippet 
* commit '9ad8a5331ca5eb6390c702ec57952043b56170bf':
  fix bug in code snippet
 2014-03-27 22:13:51 +00:00
Adam Lesinski
60f2d008ff am f7fd0088: Merge "Uses VMRuntime.newUnpaddedArray for ideal array sizes" 
* commit 'f7fd00880ec0d7c26415b00191d27cface39e3c7':
  Uses VMRuntime.newUnpaddedArray for ideal array sizes
 2014-03-27 22:13:48 +00:00
Colin Cross
8e5e145306 am 1c14c327: am c1a7d075: am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both" 
* commit '1c14c327e8781d843c3b94252db391d1baeec23d':
  app_process: use LOCAL_MULTILIB := both
 2014-03-27 22:13:44 +00:00
Adam Lesinski
92ab628ce4 am 350159c6: resolved conflicts for merge of 6984e4f9 to master 
* commit '350159c65a52092db04f1b8efce6943f61e50e73':
  Fix a race in NotificationManager with Listeners
 2014-03-27 22:13:41 +00:00
John Reck
9eaf763aa8 Merge "Force-enable hardware acceleration for apps" 2014-03-27 22:09:49 +00:00
Adam Lesinski
891a1f343d am 587e420e: am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt" 
* commit '587e420ea9fb5578985e32d31b8791e773a5861e':
  Reduce warning verbosity in aapt
 2014-03-27 22:07:51 +00:00
Leon Scroggins
3dbeca1799 Merge "Remove SkOmxPixelRef to fix build." 2014-03-27 21:51:37 +00:00
John Reck
2a09011074 Force-enable hardware acceleration for apps 
Change-Id: Ie45581fac2b6b71aeb7b652485915e2518372efc
 2014-03-27 14:51:01 -07:00
Brian Carlstrom
e0b94d1cf1 Revert "Remove doSingleCrunch call DO NOT MERGE" 
This reverts commit 3944abbb506bb94d8e70b8b62f30225777f50648.
 2014-03-27 14:50:06 -07:00
Baligh Uddin
537ea90e55 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-27 21:43:41 +00:00
Baligh Uddin
de11c26060 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-27 21:43:39 +00:00
Baligh Uddin
f8bc9e3b6a Merge "Import translations. DO NOT MERGE" 2014-03-27 21:43:34 +00:00
Baligh Uddin
51c9456b42 Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-03-27 21:43:32 +00:00
Baligh Uddin
70039b67a5 Merge "Import translations. DO NOT MERGE" 2014-03-27 21:43:30 +00:00
Baligh Uddin
1d181b8227 Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-03-27 21:43:27 +00:00
Leon Scroggins
7a3878cd8f Remove SkOmxPixelRef to fix build. 
Recent changes to SkPixelRef (from which SkOmxPixelRef inherited)
added abstract functions which SkOmxPixelRef does not implement.

Solution: remove SkOmxPixelRef, which is completely unused. The only
code that created one was commented out at the same time as it was
added in 2009, so there's likely no benefit to reviving it.

Change-Id: Icbf2537fcc03fd464fd791ff91659a1812019623
 2014-03-27 17:36:18 -04:00
Adam Hampson
25b32c65e7 hdmi: cec: add permission name to dump permission denial message 
The android.security.cts.ServicePermissionsTest--testDumpProtected test was
failing on this service because it is looking for the permission name in the
denial message.

Change-Id: I4b4d38cd27b782470d1f21e36104164d2c8962a3
Signed-off-by: Adam Hampson <ahampson@google.com>
 2014-03-27 14:20:23 -07:00
Adam Lesinski
587e420ea9 am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt" 
* commit '004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09':
  Reduce warning verbosity in aapt
 2014-03-27 21:05:06 +00:00
Adam Lesinski
004ceaaa4d am 55a65509: Merge "Reduce warning verbosity in aapt" 
* commit '55a655091a30667ba7c091dc22d350c0bb8d8641':
  Reduce warning verbosity in aapt
 2014-03-27 21:00:08 +00:00
Adam Lesinski
55a655091a Merge "Reduce warning verbosity in aapt" 2014-03-27 20:55:14 +00:00
Marco Nelissen
f0d019c4e4 Merge "Make setServer() safe to call multiple times" 2014-03-27 20:35:14 +00:00
Craig Mautner
a79501cd38 am af89d7e2: am bffd4d43: Merge "Check return values for null." into klp-modular-dev 
* commit 'af89d7e21f5d7cbe74ff4ce014d8ab2db1a6fc27':
  Check return values for null.
 2014-03-27 20:32:00 +00:00
Scott Main
f5f47eab39 am 653aa40e: am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit '653aa40ef5d21286382217a36d956213a1018b37':
  update viewport variable with new underscore format
 2014-03-27 20:25:52 +00:00
Craig Mautner
af89d7e21f am bffd4d43: Merge "Check return values for null." into klp-modular-dev 
* commit 'bffd4d437d133164877c6a194d6a533299072fae':
  Check return values for null.
 2014-03-27 20:25:45 +00:00
Marco Nelissen
1632fae376 Make setServer() safe to call multiple times 
This makes it safe to call setServer() multiple times with the same
server, different servers, or null.

b/13622801

Change-Id: Id04440df720f830e67106eb543653ace42430d97
 2014-03-27 13:25:14 -07:00
Christopher Tate
450e63af4e Merge "Unlinked providers STILL shouldn't cause crashes" 2014-03-27 20:23:36 +00:00
Christopher Tate
132933dc2e Unlinked providers STILL shouldn't cause crashes 
Bug 13651057

Change-Id: Id7e5ba521ac3f201b1a44f122358ca5af2929e06
 2014-03-27 13:22:26 -07:00
Craig Mautner
bffd4d437d Merge "Check return values for null." into klp-modular-dev 2014-03-27 20:22:20 +00:00
Craig Mautner
9410f5983b am 723f7bbc: am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity" 
* commit '723f7bbcf34168b216421eee4b7d86199f90de1f':
  Do not show Home behind full screen activity
 2014-03-27 20:20:49 +00:00
Craig Mautner
d3849f5415 Check return values for null. 
When a Display has been removed there is a delay until all of its
windows have been removed. Therefore there is a possibility that
WindowState.getDisplayContent() returns null. Guard against that
possibility.

Fixes bug 13616765.

Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
 2014-03-27 13:19:29 -07:00
Scott Main
653aa40ef5 am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit '7b190e0f1df16346696465c0114179b423afc26d':
  update viewport variable with new underscore format
 2014-03-27 20:19:20 +00:00
Craig Mautner
723f7bbcf3 am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity" 
* commit '7f7ce0f71b5f1b5274b0cda190401823508cda1f':
  Do not show Home behind full screen activity
 2014-03-27 20:14:13 +00:00
Scott Main
7b190e0f1d am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit '22b483ee6e029dc9db4ae390b91c449b7977273d':
  update viewport variable with new underscore format
 2014-03-27 20:13:59 +00:00
Scott Main
22b483ee6e am bbaf11f4: update viewport variable with new underscore format 
* commit 'bbaf11f42152d03c26ec0dc02061dc93a1feb830':
  update viewport variable with new underscore format
 2014-03-27 20:08:17 +00:00