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

175918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Olawale Ogunwale
5670d9a250 am 4af5bd7c: Merge "Add ProcessInfoService to activity manager." 
* commit '4af5bd7cdaccdba6001a384a81c258f542e74075':
  Add ProcessInfoService to activity manager.
 2015-03-30 23:25:15 +00:00
Olawale Ogunwale
4af5bd7cda Merge "Add ProcessInfoService to activity manager." 2015-03-30 22:00:12 +00:00
Rich Slogar
8807762974 am 400fd04f: am b1dc614d: am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 
* commit '400fd04fa14309220b74fcd87d5a3eb66ab430bf':
  docs: build tools 22.0.1 revision updates
 2015-03-30 21:42:58 +00:00
Rich Slogar
400fd04fa1 am b1dc614d: am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 
* commit 'b1dc614d151a90e8745964157f0f7bc2c145894f':
  docs: build tools 22.0.1 revision updates
 2015-03-30 21:37:05 +00:00
Rich Slogar
b1dc614d15 am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 
* commit 'f80370c60118441c0022333a5b4f8cda99c86774':
  docs: build tools 22.0.1 revision updates
 2015-03-30 21:30:39 +00:00
Rich Slogar
f80370c601 Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 2015-03-30 21:24:20 +00:00
Alex Klyubin
b000d129fe am 6a6f0c7d: Merge "Add HmacSHA256 backed by AndroidKeyStore." 
* commit '6a6f0c7de263743dc22b046dd9d53c694bce3ac5':
  Add HmacSHA256 backed by AndroidKeyStore.
 2015-03-30 20:47:15 +00:00
Alex Klyubin
6a6f0c7de2 Merge "Add HmacSHA256 backed by AndroidKeyStore." 2015-03-30 20:34:48 +00:00
Chad Brubaker
5341d83c3e am f603e286: Merge "Add authorization binder methods" 
* commit 'f603e2861430f13a746f80885b5fc00994f64391':
  Add authorization binder methods
 2015-03-30 20:18:34 +00:00
Chad Brubaker
f603e28614 Merge "Add authorization binder methods" 2015-03-30 20:06:39 +00:00
Alex Klyubin
4ab8ea4498 Add HmacSHA256 backed by AndroidKeyStore. 
This also adds the MAC length constraint on imported HMAC keys. HMAC
doesn't work without this constraint at the moment.

Bug: 18088752
Change-Id: I8613f58f5d2a84df00bcf6179d13e30619440330
 2015-03-30 12:53:23 -07:00
Ruben Brunk
e1e1969c96 Add ProcessInfoService to activity manager. 
- Adds a new AIDL interface for querying process
  information from activity manager.

Bug: 19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
 2015-03-30 12:20:16 -07:00
Geoff Mendal
6e22b32932 am 6e6250b9: (-s ours) Import translations. DO NOT MERGE 
* commit '6e6250b9613e7c236a07367fc800feece8bcd706':
  Import translations. DO NOT MERGE
 2015-03-30 14:49:09 +00:00
Geoff Mendal
6e6250b961 Import translations. DO NOT MERGE 
Change-Id: I386da39a3fc78ac9e7878f8962bb4a513d907893
Auto-generated-cl: translation import
 2015-03-30 07:38:42 -07:00
Mathieu Chartier
d9dddea504 am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value" 
* commit '631565abd6cadd65befe197afa7bac0d44f70fb2':
  Change getDeclaredFieldsUnchecked call to new return value
 2015-03-29 22:42:53 +00:00
Mathieu Chartier
631565abd6 Merge "Change getDeclaredFieldsUnchecked call to new return value" 2015-03-29 22:30:41 +00:00
Andreas Gampe
d7fb6d26d8 am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference" 
* commit 'a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
  Frameworks/base: Change String == to equals in Preference
 2015-03-28 05:03:25 +00:00
Andreas Gampe
0e6b4da5ca am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 
* commit '5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
  Frameworks/base: Fix request removal in VoiceInteractionSession
 2015-03-28 05:03:18 +00:00
Andreas Gampe
a01250c774 Merge "Frameworks/base: Change String == to equals in Preference" 2015-03-28 04:50:44 +00:00
Andreas Gampe
5a15bf69d8 Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 2015-03-28 04:50:08 +00:00
Mathieu Chartier
3d529c5b0a Change getDeclaredFieldsUnchecked call to new return value 
Required for related libcore change.

Bug: 19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
 2015-03-27 18:55:50 -07:00
Alex Klyubin
d7e0610477 am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore." 
* commit '36ee836d2f6e6df59d6a20a69421639bacf25559':
  Symmetric key generation for AndroidKeyStore.
 2015-03-27 23:26:08 +00:00
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
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