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

176020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
8dae38f2e5 Import translations. DO NOT MERGE 
Change-Id: I88cb981996fd8f533071e0819c314f63d7036cb1
Auto-generated-cl: translation import
 2015-04-01 02:55:00 -07:00
Alex Klyubin
3686589607 am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH" 
* commit 'b48ebf4855ec9e158ee88d05618928ff8f5943d1':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
 2015-04-01 02:05:45 +00:00
Alex Klyubin
f0c71ceb8a am 01e53ef1: am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files." 
* commit '01e53ef1fc5e3004bfb627d252565305df9a4056':
  Add license banner to recently added AndroidKeyStore files.
 2015-04-01 02:05:41 +00:00
Alex Klyubin
c230e1908f am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore." 
* commit '9c0f257f0080aba0743f34fb6202215fca295146':
  Add SecretKeyFactory backed by AndroidKeyStore.
 2015-04-01 02:05:37 +00:00
Craig Mautner
a54f2b164a am 8bed4843: am d720dedb: Merge "Clear the previous states before setting the new app visibility" 
* commit '8bed4843dc7f93a30e607dbb11012a04ca5dcf95':
  Clear the previous states before setting the new app visibility
 2015-04-01 02:05:33 +00:00
Yang Ni
02dff422a7 am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation." 
* commit '5db6f1fafa4990b2d583dcb407be361edc02019d':
  Fix value size data type in closure creation.
 2015-04-01 02:05:27 +00:00
Alex Klyubin
b48ebf4855 am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH" 
* commit '562c6a71f98e921fe8def18991b2a26f153c683d':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
 2015-04-01 01:27:54 +00:00
Alex Klyubin
01e53ef1fc am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files." 
* commit 'b7a34e4955beae2cee81a27e7c240316078bbf2f':
  Add license banner to recently added AndroidKeyStore files.
 2015-04-01 01:27:48 +00:00
Alex Klyubin
9c0f257f00 am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore." 
* commit '19e79e12d82fa473f2f7beec337de11a0c3b3a03':
  Add SecretKeyFactory backed by AndroidKeyStore.
 2015-04-01 01:27:41 +00:00
Craig Mautner
8bed4843dc am d720dedb: Merge "Clear the previous states before setting the new app visibility" 
* commit 'd720dedb03dfc937361e7e722171f8a1b9d74cf1':
  Clear the previous states before setting the new app visibility
 2015-04-01 01:27:34 +00:00
Yang Ni
5db6f1fafa am 63dde9c8: Merge "Fix value size data type in closure creation." 
* commit '63dde9c88d780fc16a4f2471e405b4f5dc35823c':
  Fix value size data type in closure creation.
 2015-04-01 01:27:27 +00:00
Alex Klyubin
562c6a71f9 Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH" 2015-04-01 00:47:01 +00:00
Alex Klyubin
c0eb55ccc7 UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH 
This is to follow naming from keymaster_defs.h

Bug: 18088752
Change-Id: If2bc91dde54f1cefcd4325d1f62d0e0b77fc5d59
 2015-03-31 17:16:31 -07:00
Alex Klyubin
b7a34e4955 Merge "Add license banner to recently added AndroidKeyStore files." 2015-03-31 23:52:46 +00:00
Alex Klyubin
cc21bb3a56 Add license banner to recently added AndroidKeyStore files. 
Bug: 18088752
Change-Id: I027f9530a02cca081aae8eb94833d2fdcb678e9a
 2015-03-31 16:50:37 -07:00
Alex Klyubin
19e79e12d8 Merge "Add SecretKeyFactory backed by AndroidKeyStore." 2015-03-31 23:32:41 +00:00
Alex Klyubin
acc835f385 Add SecretKeyFactory backed by AndroidKeyStore. 
This factory provides a way to obtain information about a SecretKey
backed by AndroidKeyStore. The information is provided in a form of an
instance of KeyStoreKeySpec class.

EXAMPLE

SecretKeyFactory factory = SecretKeyFactory.getInstance(
        key.getAlgorithm(), "AndroidKeyStore");
KeyStoreKeySpec keySpec =
    factory.getKeySpec(key, KeyStoreKeySpec.class);

Bug: 18088752
Change-Id: I26c9dd544f80230fe7039501eeb471eaf875452b
 2015-03-31 15:29:48 -07:00
Craig Mautner
d720dedb03 Merge "Clear the previous states before setting the new app visibility" 2015-03-31 22:24:15 +00:00
Yang Ni
63dde9c88d Merge "Fix value size data type in closure creation." 2015-03-31 21:32:24 +00:00
Alex Klyubin
d684ebd3a6 am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." 
* commit '0bd10c21ff1bb00f178738301ad4663c7cebd28f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.
 2015-03-31 21:20:51 +00:00
Alex Klyubin
0bd10c21ff am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." 
* commit '5960c3d56614830439718e93968e0c7d2727262f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.
 2015-03-31 21:13:49 +00:00
Alex Klyubin
5960c3d566 Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." 2015-03-31 21:00:17 +00:00
Alex Klyubin
b406f24291 Add unauthenticated AES ciphers backed by AndroidKeyStore. 
This adds the following AES transformations:
* AES/ECB/NoPadding
* AES/ECB/PKCS7Padding
* AES/CBC/NoPadding
* AES/CBC/PKCS7Padding
* AES/CTR/NoPadding

Bug: 18088752
Change-Id: I3e4702e59868f8f2225c31b1c159d20008b9999d
 2015-03-31 13:59:07 -07:00
Kenny Root
28c51bacbd am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit 'a3a52a96543bd3874e23d90f91b5f4197eab98e5':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 19:22:17 +00:00
Kenny Root
a3a52a9654 am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit '4999b175e9c25b7e860f9c2f3b6566d08c8e50e7':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 19:14:48 +00:00
Kenny Root
4999b175e9 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 19:10:50 +00:00
Chad Brubaker
543189eb71 am 826d6357: am 5491ea9e: Merge "Include operation handle in OperationResult" 
* commit '826d63572be4b23ad2f70f3004d520d54ef4dc01':
  Include operation handle in OperationResult
 2015-03-31 18:10:02 +00:00
Chad Brubaker
826d63572b am 5491ea9e: Merge "Include operation handle in OperationResult" 
* commit '5491ea9e5bc6ce8eb0dc2e91e46608f6aa3e7dfc':
  Include operation handle in OperationResult
 2015-03-31 18:03:21 +00:00
Chad Brubaker
5491ea9e5b Merge "Include operation handle in OperationResult" 2015-03-31 17:49:16 +00:00
Svetoslav
becacfb843 am ffd24a58: am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit 'ffd24a58c89bcb502e8d6299b4368353b08a45be':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:54:36 +00:00
Kenny Root
6a2d2b9f2b am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit '5fdb2ea76a8e0ffe8786a1e92ce565f7380384db':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 16:54:32 +00:00
Svetoslav
ffd24a58c8 am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit '13d8e41d3a866df0899a89c44c6afc4e2eb31bdc':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:46:44 +00:00
Kenny Root
5fdb2ea76a am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit 'a7645df5973cfb26aecabe093409e33eb745df17':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 16:46:39 +00:00
Svetoslav
13d8e41d3a am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit 'c6be7545b4106b9ba586e365f2d2ab911cafea93':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:41:00 +00:00
Kenny Root
a7645df597 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 16:40:15 +00:00
Svetoslav
c6be7545b4 am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit '37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:33:21 +00:00
Olawale Ogunwale
6abcec1d76 am df736de8: am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 
* commit 'df736de8d8165b1aff675d00581ccdf94a7547aa':
  [ActivityManager] Fix index out of bounds when updating next pss time.
 2015-03-31 16:27:48 +00:00
Olawale Ogunwale
df736de8d8 am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 
* commit 'd052a3d37beffff3735716340745ec7c83efc23d':
  [ActivityManager] Fix index out of bounds when updating next pss time.
 2015-03-31 16:21:03 +00:00
Kenny Root
9a7c1a3549 Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE 
This reverts commit 693ea60e9e3d2ef476e4f45caac234360d90bdb9.

Bug: 19894176
Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b
 2015-03-31 09:15:40 -07:00
Kenny Root
9eed9e962c Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE 
This reverts commit 4ff668d47ab9f49ec81606aec6d469ecd6ca37fa.

Bug: 19894176
Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd
 2015-03-31 09:15:37 -07:00
Olawale Ogunwale
d052a3d37b Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 2015-03-31 16:09:16 +00:00
Neil Fuller
962a11ad5b am efd92907: am 25c5296b: Merge "An updater for all timezone data on a device" 
* commit 'efd92907898161efe466889d2229e4acde2e973c':
  An updater for all timezone data on a device
 2015-03-31 09:39:47 +00:00
Neil Fuller
efd9290789 am 25c5296b: Merge "An updater for all timezone data on a device" 
* commit '25c5296b0d85979ad216195000b857dce8127ab1':
  An updater for all timezone data on a device
 2015-03-31 09:31:48 +00:00
Neil Fuller
25c5296b0d Merge "An updater for all timezone data on a device" 2015-03-31 08:31:00 +00:00
riddle_hsu
6793fc328a [ActivityManager] Fix index out of bounds when updating next pss time. 
Symptom:
System server crash.

Root Cause:
The value curProcState for array index is -1 if the process
has not attached yet.

Solution:
Skip computing for process which is not attached or curProcState
is nonexistent state.

Change-Id: I71aaf45bb78d73097ebe9dfebf76b72f2d243232
 2015-03-31 11:54:14 +08:00
Andreas Gampe
abeba1ff33 am c10fa20b: am 02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property" 
* commit 'c10fa20bf2dd5efa1e6f93062f8040b2bdf83e99':
  Frameworks/base: Support dex2oat threads system property
 2015-03-31 03:39:04 +00:00
Andreas Gampe
c10fa20bf2 am 02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property" 
* commit '02c4bbb9648da99947da57b1605020340a334b5f':
  Frameworks/base: Support dex2oat threads system property
 2015-03-31 03:31:36 +00:00
Andreas Gampe
02c4bbb964 Merge "Frameworks/base: Support dex2oat threads system property" 2015-03-31 03:20:09 +00:00
Andreas Gampe
e035238823 Frameworks/base: Support dex2oat threads system property 
Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.

Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.

Bug: 19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
 2015-03-30 20:16:03 -07:00
Svetoslav
37661db7fa AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.

bug:16954787

Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
(cherry picked from commit 5738fec00db65e0ee246475a7236e57ba3ee8d55)
 2015-03-31 01:25:35 +00:00