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
louis_chang
5064fddf81
[ActivityManager] Examine bad process before clean up application
...
record
Symptom:
Unable to launch activity
Root cause:
There are some cases that would start process while pid
assigned or already running. So the previous application
record will be clean up via handleAppDiedLocked(), but it
won't be removed from ActivityManager.mProcessNames since
the process is supposed to be restart later.
However, if the process is started from a background
operation and has named as a bad process, it silently fail
the launch. Then, the process won't ever be request to
start afterward. The process status is app.pid > 0 and
app.thread is null.
The application components are unable to launch since then.
Solution:
Examine bad process before clean up application record
Change-Id: I53dc06e49254094abc06e460c8b8b33f36803601
2015-03-31 15:18:21 +08:00
Andreas Gampe
74ad30f969
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
(cherry picked from commit e0352388238875ef7e7b31d914fc903b08ff0f6b)
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
2015-03-30 21:05:12 -07: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
Olawale Ogunwale
ad0acc08af
am 5670d9a2: am 4af5bd7c: Merge "Add ProcessInfoService to activity manager."
...
* commit '5670d9a2503557ca583eddcab1702800b5016cd9':
Add ProcessInfoService to activity manager.
2015-03-30 23:30: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
Rich Slogar
69fe4588b7
am 88077629: am 400fd04f: am b1dc614d: am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
...
* commit '88077629748f90211684c2676ca16a8a7c85b9fd':
docs: build tools 22.0.1 revision updates
2015-03-30 23:13:20 +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
7ca65f0901
am b000d129: am 6a6f0c7d: Merge "Add HmacSHA256 backed by AndroidKeyStore."
...
* commit 'b000d129fe81aab547464968a9f242357c5f6a88':
Add HmacSHA256 backed by AndroidKeyStore.
2015-03-30 20:54:40 +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
7081a16859
am 5341d83c: am f603e286: Merge "Add authorization binder methods"
...
* commit '5341d83c3e9c22efff90cfbb9b039580351bc929':
Add authorization binder methods
2015-03-30 20:25:00 +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
Fyodor Kupolov
b94c1657eb
Support for storing OAT files in app directory
...
In installPackageLI, dexopt is now performed on a staging directory of the app
(dexopt phase 1). For each codepath:
- /oat/<isa> directory is created
- dexopt output goes to the newly created directory. Optimized files have
.odex extension.
Bug: 19550105
Change-Id: Iec59790d97837b78af82b079fd1970de3388c91d
2015-03-30 11:32:56 -07:00
Yang Ni
4c93c8c93a
Fix value size data type in closure creation.
...
b/19944127
Also added references to arguments and global values in a closure to
keep them live in Java while native code may access them.
Change-Id: I1179d34aa67f845578740e71cc2da4f82419f251
2015-03-30 10:45:34 -07:00
Luan Nguyen
e42aa1caf0
docs: Update ambient mode to mention disabling bitmap filtering
...
bug: 19429396
Change-Id: I51c1c58211cbdcb8c293b693627c659fd55537cf
2015-03-30 15:45:55 +00:00
Luan Nguyen
7eecdd553a
docs: Remove note about inablity to submit apps to Google Play.
...
Change-Id: I15577e02ac4a4fed247209f9115439dc4216018e
2015-03-30 15:44:08 +00:00
Geoff Mendal
b64b78856c
am 6e22b329: (-s ours) am 6e6250b9: (-s ours) Import translations. DO NOT MERGE
...
* commit '6e22b3293298b721815b321b503cbe4ce34ae77d':
Import translations. DO NOT MERGE
2015-03-30 14:56:54 +00: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
e9669588c2
Import translations. DO NOT MERGE
...
Change-Id: I451a8edb373ffeeddb1d05d6e5c15ff35d4c9109
Auto-generated-cl: translation import
2015-03-30 07:47:39 -07: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
2169c68aa3
am d9dddea5: am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
...
* commit 'd9dddea504d717120eaa5e9c15fe484e26511e92':
Change getDeclaredFieldsUnchecked call to new return value
2015-03-30 00:26:46 +00: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
3fa46a0f79
am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
...
* commit 'd7fb6d26d809775996f70e23213392a3dcf10c8f':
Frameworks/base: Change String == to equals in Preference
2015-03-28 05:11:07 +00:00
Andreas Gampe
1bca353268
am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
...
* commit '0e6b4da5ca53d338f351827f7a351edcd6281aaa':
Frameworks/base: Fix request removal in VoiceInteractionSession
2015-03-28 05:11:02 +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
23c2b8e81e
am d7e06104: am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
...
* commit 'd7e0610477b1a97ce6b566a19e1fe9246bc30f52':
Symmetric key generation for AndroidKeyStore.
2015-03-27 23:37:49 +00:00
Chad Brubaker
db22c6595c
am 3e89fac5: am dbd9a4b6: Merge "Allow entropy to be provided to some operations"
...
* commit '3e89fac56966fc30790430f128887a987fea63d8':
Allow entropy to be provided to some operations
2015-03-27 23:37:44 +00: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