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

183832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Norbye
80756e3888 Annotate ARGB integer parameters with @ColorInt 
Change-Id: I307f72a382272cf18ddb6b07d9fcb81228568d9a
 2015-03-05 16:34:12 -08:00
Tor Norbye
cb59f2afb7 Additional annotations: @CallSuper, @Keep, etc. 
These mirror the new support library annotations, but
with source retention.

Change-Id: Ib85ceeb37d596aae8cf12d4f8fede3982552d033
 2015-03-05 16:34:11 -08:00
Dan Sandler
eef3fbcf68 am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit '8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:31:04 +00:00
Miao Wang
2cd0c340fc [RenderScript] Add missing variable 
Change-Id: I148bab3a8c3fb360d345549401d0ed579a37e971
 2015-03-05 16:27:15 -08:00
Dan Sandler
8deb6d95a7 am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit 'e6a4b445944489d67d40c8f52322fb149290fcf8':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:21:47 +00:00
Dan Sandler
e6a4b44594 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit '3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:10:22 +00:00
Dan Sandler
3581f4c91a Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 2015-03-06 00:03:37 +00:00
Dan Albert
9488813873 am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master 
* commit '7a79c4cac3b0c722832e868346db2375b6d6c379':
  Stop using namespace std.
 2015-03-05 23:56:53 +00:00
John Reck
0affc5f3eb Merge "Cleanup Bitmap JNI attempt #2" 2015-03-05 23:55:14 +00:00
Dan Albert
7a79c4cac3 am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master 
* commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7':
  Stop using namespace std.
 2015-03-05 23:50:35 +00:00
Miao Wang
288e6f6718 Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom." 2015-03-05 23:49:57 +00:00
Eric Gilmore
8eed9c7e61 am dcfa5e03: am 6e3c763f: am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit 'dcfa5e03f76e6ba9579125669d07cac09cde8cd2':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:46:49 +00:00
Dan Albert
f8d6a4ba87 resolved conflicts for merge of 701f9c2f to stage-aosp-master 
Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
 2015-03-05 15:41:39 -08:00
Julia Reynolds
2482100fed Merge "Allow device and profile owners to set a user icon." 2015-03-05 23:39:04 +00:00
Eric Gilmore
dcfa5e03f7 am 6e3c763f: am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '6e3c763f0146377f610227c879c8037b1842ab6e':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:38:31 +00:00
Dan Albert
701f9c2fd8 Merge "Stop using namespace std." 2015-03-05 23:31:41 +00:00
Eric Gilmore
6e3c763f01 am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '685e6ce830f97383846335eec758e83ba3ad7060':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:26:17 +00:00
Eric Gilmore
685e6ce830 am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '636a39babbda97743b33511b3dd2addafc8c2847':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:11:09 +00:00
Eric Gilmore
636a39babb am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit 'e95fa2649b62a3fbccd096b43925a17c6ff03228':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:04:27 +00:00
Andreas Gampe
ddbc48cdee am 0fcfae88: am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly" 
* commit '0fcfae88f2737b004cae83a77d590046e2b08ef3':
  Frameworks/base: Use ArraySet more explicitly
 2015-03-05 22:55:34 +00:00
Eric Gilmore
e95fa2649b am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit 'e17b0a14ccc427bff386517537fcf23e00a087d4':
  Re-fixing link, and removing trailing white space.
 2015-03-05 22:50:16 +00:00
Andreas Gampe
0fcfae88f2 am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly" 
* commit 'ecc20aafa6f3d272292e7b3577c99f2c127e590f':
  Frameworks/base: Use ArraySet more explicitly
 2015-03-05 22:46:49 +00:00
Yigit Boyar
38d909a57d Fix build. getAlingment should not be public 
Change-Id: I4abde1ddc78367795601215106388d6eb535cbca
 2015-03-05 22:40:06 +00:00
Andreas Gampe
ecc20aafa6 am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly" 
* commit '63ab6eb220a2a75837d6e3d18d19cbd5dda175eb':
  Frameworks/base: Use ArraySet more explicitly
 2015-03-05 22:38:56 +00:00
George Mount
f2e9ca1f52 Merge "Handle null epicenters in EpicenterClipReveal." 2015-03-05 22:36:02 +00:00
Eric Gilmore
e17b0a14cc am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '87499b275bc7a8d4a12a3134646769a5c6c34829':
  Re-fixing link, and removing trailing white space.
 2015-03-05 22:34:58 +00:00
Andreas Gampe
63ab6eb220 Merge "Frameworks/base: Use ArraySet more explicitly" 2015-03-05 22:33:43 +00:00
George Mount
3c75db9961 Handle null epicenters in EpicenterClipReveal. 
Bug 19617067

Change-Id: Ie288288f7a8e0c95ed07d8beb40b78f80048fa98
 2015-03-05 14:33:37 -08:00
Yigit Boyar
fbd9997e68 Remove original movements record from GridLayout 
Change-Id: Iebb761d0195b9d123dada1262090a71c4c175c5e
 2015-03-05 22:20:12 +00:00
John Spurlock
0c09383114 Merge "AudioService: Add current stream devices to dumpsys output." 2015-03-05 22:12:49 +00:00
Yigit Boyar
6dafd87fb4 Fix some weight bugs in grid layout 
This CL also changes how GONE views are considered.
Previously, they would still participate in weight calculations.
Now, they are ignored.

Bug: 19546781

Sub bugs:

Bug: 19571249
Bug: 19571653
Bug: 19571319
Bug: 19571841
Change-Id: I7344f757d3a76be98bb92660f07d2a0cafa9ac12
 2015-03-05 22:01:14 +00:00
Eric Gilmore
87499b275b Merge "Re-fixing link, and removing trailing white space." into lmp-docs 2015-03-05 22:00:22 +00:00
John Reck
f4faeac352 Cleanup Bitmap JNI attempt #2 
Original version missed a spot

This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.

Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
 2015-03-05 13:56:16 -08:00
Eric Gilmore
08134e649d Re-fixing link, and removing trailing white space. 
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
 2015-03-05 13:39:21 -08:00
Derek Sollenberger
cd4ed96d10 emove uncessary include for SkPorterDuff.h (Part 2) 
Change-Id: I4d29d65a2e8eaf26b1cde6a525703be248bce63d
 2015-03-05 16:27:06 -05:00
Raph Levien
560a433c44 Merge "Add JNI StaticLayout.Builder" 2015-03-05 21:26:32 +00:00
Derek Sollenberger
0313f2680c Remove uncessary include for SkPorterDuff.h 
Change-Id: Ibcbed5dd2dc327821fc26e87191185f0069c9911
 2015-03-05 16:22:17 -05:00
Andreas Gampe
0888276a1c Frameworks/base: Use ArraySet more explicitly 
In KeySetManagerService, use ArraySet more explicitly. Avoid for-each
loops.

Collections API methods on ArraySet are not very efficient. Iterators
incur two object allocations: a helper and the actual iterator object.
During boot, about 4.5K such calls are made. Using the ArraySet more
explicitly like an ArrayList/array avoids the overhead.

Bug: 19617481
Change-Id: I25df334fa1d4be3210667fb1404e3c43f2585049
 2015-03-05 13:13:55 -08:00
Rich Slogar
6fd2b3c63c am f02b1abc: am 2847fc99: am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit 'f02b1abc2726692dd69f10c1c9e7fa69ccc4ab63':
  docs: sdk tools date fix
 2015-03-05 20:11:26 +00:00
Rich Slogar
f02b1abc27 am 2847fc99: am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit '2847fc9912715027492bdae8567cd896b7ba8f9f':
  docs: sdk tools date fix
 2015-03-05 20:05:31 +00:00
Rich Slogar
2847fc9912 am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit 'cfb0978fd9a6bf8fa06dee061df03fccf20fabc4':
  docs: sdk tools date fix
 2015-03-05 19:59:55 +00:00
Rich Slogar
cfb0978fd9 am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit 'bc669e3f555519f641102b759a04a01ac5c10cad':
  docs: sdk tools date fix
 2015-03-05 19:52:05 +00:00
Rich Slogar
bc669e3f55 am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit 'dad1cbebfabf421efc90d366d9c4fd67becf930f':
  docs: sdk tools date fix
 2015-03-05 19:46:12 +00:00
Rich Slogar
dad1cbebfa am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit '9f485e971e06dad399dd70712787f4c30da9515e':
  docs: sdk tools date fix
 2015-03-05 19:39:47 +00:00
Chad Jones
b9a468eb19 Merge "Revert "Cleanup Bitmap JNI"" 2015-03-05 19:35:15 +00:00
Chad Jones
c02977e3bb Revert "Cleanup Bitmap JNI" 
This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.

Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
 2015-03-05 19:34:26 +00:00
Rich Slogar
9f485e971e am 4aba69a8: docs: sdk tools date fix 
* commit '4aba69a8a7f58541ce76429252dd0c9650b40f35':
  docs: sdk tools date fix
 2015-03-05 19:33:56 +00:00
Adrian Roos
a4da9f6b99 Remove leftover code causing trust agent issues 
When trust agent whitelists were added in MR1,
the isTrustDisabled method was left in although
it prevents the whitelist from working properly.

Bug: 19461292
Change-Id: I72eb041b03e1f16c582cbf2a0bb622a70444caeb
 2015-03-05 19:27:37 +00:00
Brian Attwell
54b804fa74 Merge "Prioritize regular names over phonetic names. P1" 2015-03-05 19:26:36 +00:00
Adrian Roos
b37f518205 Revert "Remove TrustAgent whitelisting API" 
This reverts commit bc4f2ccf6cfd1a512ad907eda2713ea3c4a1755e
and re-enables the API for MNC.

Bug: 19461292
Change-Id: I53b94bacb6a879fcc0598edfc0f3d44a9dd9e84c
 2015-03-05 19:26:07 +00:00