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

176599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Brubaker
3e89fac569 am dbd9a4b6: Merge "Allow entropy to be provided to some operations" 
* commit 'dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
  Allow entropy to be provided to some operations
 2015-03-27 23:25:59 +00:00
Bart Sears
8045a23a08 am c27d3c2b: am c03cfc9d: am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 
* commit 'c27d3c2bd440a69d22bec8dd2c7bfe511fa53eba':
  CEC: Explicitly turn on screen for remote control passthrough
 2015-03-27 23:24:11 +00:00
Alex Klyubin
8e7df37c9a am d880dc2f: am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore." 
* commit 'd880dc2fb23aa3564c46169f7b0651bd2ca2c2de':
  Symmetric key import for AndroidKeyStore.
 2015-03-27 23:13:24 +00:00
Bart Sears
c27d3c2bd4 am c03cfc9d: am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 
* commit 'c03cfc9d86c4324464ae44b49c7ac31c9a4bba50':
  CEC: Explicitly turn on screen for remote control passthrough
 2015-03-27 23:08:46 +00:00
Alex Klyubin
36ee836d2f Merge "Symmetric key generation for AndroidKeyStore." 2015-03-27 22:59:19 +00:00
Alex Klyubin
d23a1f706f Symmetric key generation for AndroidKeyStore. 
This currently supports AES and HMAC with SHA-256.

Bug: 18088752
Change-Id: Ife55438cf4129b895295681bb35091cd37eb73fb
 2015-03-27 15:57:53 -07:00
Alex Klyubin
d880dc2fb2 am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore." 
* commit '274a4ee3446e76a34a9cfe987e98f7bf4e53f78d':
  Symmetric key import for AndroidKeyStore.
 2015-03-27 21:42:08 +00:00
Chad Brubaker
dbd9a4b651 Merge "Allow entropy to be provided to some operations" 2015-03-27 21:38:44 +00:00
Chad Brubaker
dae79e5408 Allow entropy to be provided to some operations 
generateKey and begin can now optionally take an array of bytes to add
to the rng entropy of the device before the operation. If entropy is
specified and the device does not support add_rng_entropy or the call
fails then that device will not be used, leading to fallback or error
depending on the situation.

Change-Id: Id7d33e3cc959594dfa5483d002993ba35c1fb134
 2015-03-27 14:28:35 -07:00
Bart Sears
c03cfc9d86 am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 
* commit 'd4c3ef87f8aaef9eb5ec66856dffc9eca5537573':
  CEC: Explicitly turn on screen for remote control passthrough
 2015-03-27 21:23:01 +00:00
Bart Sears
d4c3ef87f8 am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 
* commit '4a26c391d08dfa6a3c189293f0fc163b817b1b49':
  CEC: Explicitly turn on screen for remote control passthrough
 2015-03-27 21:14:37 +00:00
Bart Sears
4a26c391d0 Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 2015-03-27 20:48:38 +00:00
Alex Klyubin
274a4ee344 Merge "Symmetric key import for AndroidKeyStore." 2015-03-27 19:21:13 +00:00
Johan8 Persson2
567267015d Fixed memory leak in ExtractEditLayout finish() 
When marking text and opening the edit text dialog
and then rotating the device would result in references
being kept to the edit text dialog and the memory would
never get released again.

Change-Id: I3e95083e4923844d2b496ea79174ef97e77f8686
 2015-03-27 13:23:11 +01:00
Deepanshu Gupta
c1c3b88ebd am 80d5c425: am fb37c97c: am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '80d5c4250f6a7b55b34bb033620df54cdbb31499':
  Fix tests for Java 6.
 2015-03-27 03:15:31 +00:00
Christopher Tate
9c36cf4195 am 9837c51a: am 63862a20: am 7b73a788: am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit '9837c51acc274531a4109b9973a7d7927787da6c':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 03:15:27 +00:00
Deepanshu Gupta
80d5c4250f am fb37c97c: am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit 'fb37c97c251cc9bef81dbf5b9acc58328656a980':
  Fix tests for Java 6.
 2015-03-27 03:05:16 +00:00
Christopher Tate
9837c51acc am 63862a20: am 7b73a788: am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit '63862a2052d41db4543a6a15713f5146b76d65cc':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 03:05:09 +00:00
Deepanshu Gupta
fb37c97c25 am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '61bb0b4f58f794ff468f2cfaf958cb5cc0b09026':
  Fix tests for Java 6.
 2015-03-27 02:58:47 +00:00
Christopher Tate
63862a2052 am 7b73a788: am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit '7b73a788f0c18a31de729daa51e7e06286cf7609':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 02:58:40 +00:00
Deepanshu Gupta
61bb0b4f58 am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '4e6ae02a29dd432648a81f3803f3ccf712621d43':
  Fix tests for Java 6.
 2015-03-27 02:49:27 +00:00
Christopher Tate
7b73a788f0 am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit 'dbe0dd160e93feef1335830a36e86ae83b19b793':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 02:49:23 +00:00
Jason Sams
5f786f0dab am 226fc774: am ee80414d: Merge "Fix doc bug for object size." 
* commit '226fc77468647303a81a05198851c81222e68efc':
  Fix doc bug for object size.
 2015-03-27 01:24:54 +00:00
Michael Runge
34ec4cc7b3 am 7b1237e5: am 0f9b7015: am 9e3976b6: am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '7b1237e52c2553a78b1839017b36718b5f3e6095':
  Increase timeout when uncrypting OTA
 2015-03-27 01:24:48 +00:00
Amith Yamasani
bf67d25be9 am cffe727e: am a5c20b98: am c704bc64: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit 'cffe727eb2f2e559c20a9eed92f96982a53c4625':
 2015-03-27 01:24:45 +00:00
Deepanshu Gupta
ec2a40969c am c55858ff: am fc18e950: am cfdd1e18: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'c55858ffd0039afb49f01ad06ed430bf206aa0d7':
 2015-03-27 01:24:40 +00:00
Deepanshu Gupta
1bf6d5432f am 5935ee2f: am 836f5d98: am 85afc992: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '5935ee2fc9a7f0cfd8be303c8474937aca2ef40c':
 2015-03-27 01:24:37 +00:00
Deepanshu Gupta
218ab6f48d am e91d8d82: am 18755bfa: am 0c8ccefc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e91d8d82ebbc23ac9a067687d8a32a28685a939e':
 2015-03-27 01:24:33 +00:00
Deepanshu Gupta
1a3b4701f7 am 1a715a54: am 7a5a976c: am c07448d2: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '1a715a540f24895fc13bb58dc5c4919d9534f2b1':
 2015-03-27 01:24:29 +00:00
Deepanshu Gupta
703e0aec57 am 1ea4657b: am 02e11a59: am 75614212: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '1ea4657bbb6bc58e573e7b3e791fa659c4bec4fc':
 2015-03-27 01:24:24 +00:00
Deepanshu Gupta
070c3427c2 am 46e61156: am 173e931d: am 5bbc0265: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '46e61156a080152c504f2b9c674e990f19dee8e2':
 2015-03-27 01:24:20 +00:00
Jeff Brown
833ed282e1 am 16869c8e: am a15ce03e: am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit '16869c8e25a7dbafb1c0aed29f2bd8e164fa9b67':
 2015-03-27 01:24:16 +00:00
Jason Sams
226fc77468 am ee80414d: Merge "Fix doc bug for object size." 
* commit 'ee80414d0ddd6a27bbf86e0de47dd86bc335431d':
  Fix doc bug for object size.
 2015-03-27 01:13:26 +00:00
Michael Runge
7b1237e52c am 0f9b7015: am 9e3976b6: am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '0f9b70159a07f09f34c3688cce4b30362afa1855':
  Increase timeout when uncrypting OTA
 2015-03-27 01:10:25 +00:00
Amith Yamasani
cffe727eb2 am a5c20b98: am c704bc64: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit 'a5c20b98cd1c0b18fa3d434f0ecf44cd8db155f4':
 2015-03-27 01:10:17 +00:00
Deepanshu Gupta
c55858ffd0 am fc18e950: am cfdd1e18: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'fc18e950bf5a05ac29e1b070b0bdfd5002903cae':
 2015-03-27 01:10:01 +00:00
Deepanshu Gupta
5935ee2fc9 am 836f5d98: am 85afc992: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '836f5d986f9dc4d6915aade059ef5ff7e584cde1':
 2015-03-27 01:09:56 +00:00
Deepanshu Gupta
4e6ae02a29 am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '17bb697b3bce1b23137553829dd62e0e7c16b472':
  Fix tests for Java 6.
 2015-03-27 01:09:53 +00:00
Deepanshu Gupta
e91d8d82eb am 18755bfa: am 0c8ccefc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit '18755bfa3e346c42212f235e79856de54aae2095':
 2015-03-27 01:09:45 +00:00
Deepanshu Gupta
1a715a540f am 7a5a976c: am c07448d2: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '7a5a976c9e054303ddd19a26c587c5e34368a339':
 2015-03-27 01:09:39 +00:00
Deepanshu Gupta
1ea4657bbb am 02e11a59: am 75614212: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '02e11a595ec064c94ac71336d6197eb3018eece1':
 2015-03-27 01:09:32 +00:00
Deepanshu Gupta
46e61156a0 am 173e931d: am 5bbc0265: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '173e931d4587c2dd1e6777a615a8c388e5df7caf':
 2015-03-27 01:09:27 +00:00
Jeff Brown
16869c8e25 am a15ce03e: am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit 'a15ce03ee716be8b59965e0aeb6e6fcb23a8c237':
 2015-03-27 01:09:22 +00:00
Deepanshu Gupta
17bb697b3b am ec8df9af: Fix tests for Java 6. 
* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.
 2015-03-27 01:02:58 +00:00
Jason Sams
ee80414d0d Merge "Fix doc bug for object size." 2015-03-27 00:58:46 +00:00
Michael Runge
0f9b70159a am 9e3976b6: am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '9e3976b6feba28b027122af25b21c9eca6705f0f':
  Increase timeout when uncrypting OTA
 2015-03-27 00:50:41 +00:00
Amith Yamasani
a5c20b98cd am c704bc64: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit 'c704bc647270c30b5c38d53d10228325befeb0b7':
 2015-03-27 00:50:33 +00:00
Deepanshu Gupta
fc18e950bf am cfdd1e18: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'cfdd1e18a8039b8c0b1c1f260018cac3a613c3ec':
 2015-03-27 00:50:27 +00:00
Deepanshu Gupta
836f5d986f am 85afc992: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '85afc992ea0058155c73b2ad06f130df7bc697f4':
 2015-03-27 00:50:19 +00:00
Deepanshu Gupta
18755bfa3e am 0c8ccefc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit '0c8ccefc54f4ddb2cc91df093bc09bd4ac8a1215':
 2015-03-27 00:50:00 +00:00