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

126668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
da89d891f6 am 301ffc41: (-s ours) am bd877cb6: am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit '301ffc4177ee2a556e5d22f3fcf84dadd5a59b44':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 05:26:58 +00:00
Brian Carlstrom
301ffc4177 am bd877cb6: am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'bd877cb67f09277679007bc705e28ee4a2eda02f':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:50:53 +00:00
Brian Carlstrom
bd877cb67f am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit '69511ada3cc833f341bd7df006de0f8c44848eb8':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:45:14 +00:00
Brian Carlstrom
69511ada3c am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'b244097b48398514c88c21506567fe400fb41f9e':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:13:04 +00:00
Brian Carlstrom
b244097b48 am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'cc4d10d0f1f349ad13dcd67fc19718bf31932840':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:08:43 +00:00
Brian Carlstrom
cc4d10d0f1 am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'cec0280a1d935cf31f6b2b480af0f463e2d8c91a':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:01:40 +00:00
Baligh Uddin
7d1ad86912 am e136f5e2: (-s ours) am 0b7f300a: (-s ours) am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e136f5e26f238c6450cad467435cce2f3a75f1c3':
  Import translations. DO NOT MERGE
 2014-03-27 23:16:55 +00:00
Selim Cinek
49fb8aeff5 am c3db8011: am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation 
* commit 'c3db8011d7f7a5bcb0a9e5ae2d20022c6e88d8f9':
  Fixed crash when setting wallpaper with built in rotation
 2014-03-27 23:16:51 +00:00
Baligh Uddin
e136f5e26f am 0b7f300a: (-s ours) am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '0b7f300a5545dc3576e74f4702bcc6b5497348f1':
  Import translations. DO NOT MERGE
 2014-03-27 23:10:35 +00:00
Selim Cinek
c3db8011d7 am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation 
* commit '58e99f564d552984d5088969a2aa827812db10ac':
  Fixed crash when setting wallpaper with built in rotation
 2014-03-27 23:10:32 +00:00
Baligh Uddin
0b7f300a55 am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '852750b321c8f23c0b776a193a65d8f78afcf22b':
  Import translations. DO NOT MERGE
 2014-03-27 23:05:01 +00:00
Selim Cinek
58e99f564d am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation 
* commit 'b6e077dcbe1034007fd52b48951637a9be4bab74':
  Fixed crash when setting wallpaper with built in rotation
 2014-03-27 23:04:57 +00:00
Alan Viverette
7c495dcd11 Merge "Enforce restrictions on recycled TypedArrays" 2014-03-27 22:40:07 +00:00
Alan Viverette
fd274a0d4a Enforce restrictions on recycled TypedArrays 
No calls may be made to recycled TypedArrays, and we'll throw a
detailed exception if developers attempt to do so. Also fixes the
place where we were doin' it wrong.

BUG: 13673783
Change-Id: Ia7a382d90fce8aef7741d926028b2d01b57435ae
 2014-03-27 15:39:15 -07:00
Brian Carlstrom
cec0280a1d am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'bea6517da91e9af08feb8c305ec9d9a4576dc6ad':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-27 22:29:08 +00:00
Baligh Uddin
b5853c7453 am 7e905127: (-s ours) am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '7e90512771943c2b87d96bba8a90e80eb26c65a7':
  Import translations. DO NOT MERGE
 2014-03-27 22:26:38 +00:00
Alan Viverette
433ee01236 Merge "Allow a null tint in TouchFeedbackDrawable" 2014-03-27 22:25:11 +00:00
Alan Viverette
e3eb8ec0b7 Allow a null tint in TouchFeedbackDrawable 
This ensures we won't crash if a Quantum drawable is inflated in a
Holo theme, but it won't look correct, so don't do that.

BUG: 13677025
Change-Id: I30cbff36bf3746543240d4c96cc57776874566d8
 2014-03-27 15:21:11 -07:00
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
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
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
70039b67a5 Merge "Import translations. DO NOT MERGE" 2014-03-27 21:43:30 +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 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
Craig Mautner
7f7ce0f71b am a2824410: Merge "Do not show Home behind full screen activity" 
* commit 'a282441038b8a82be1b9b6afc41145e5570ce377':
  Do not show Home behind full screen activity
 2014-03-27 20:07:57 +00:00