OSDN Git Service
Luan Nguyen [Wed, 1 Apr 2015 20:05:05 +0000 (20:05 +0000)]
am
b9b2801d: am
b2bd8f8a: am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
b9b2801da423a1ce79b8738ef7ce8d8a6e4e8532':
docs: Add voice intent for starting a stopwatch
Luan Nguyen [Wed, 1 Apr 2015 19:54:52 +0000 (19:54 +0000)]
am
b2bd8f8a: am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
b2bd8f8ac8405beaa5b531d1e23256315d7555bc':
docs: Add voice intent for starting a stopwatch
Luan Nguyen [Wed, 1 Apr 2015 19:43:39 +0000 (19:43 +0000)]
am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
7542c44ee45a195404eccf50a82df7903e2ecd9c':
docs: Add voice intent for starting a stopwatch
Luan Nguyen [Wed, 1 Apr 2015 19:21:39 +0000 (19:21 +0000)]
Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
Bryce Lee [Wed, 1 Apr 2015 19:15:11 +0000 (19:15 +0000)]
am
7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev
* commit '
7a1454fe69bc2aa561874e550b05d5cb218bc047':
Do not use the status bar as the system decor layer if it is not visible.
Bryce Lee [Wed, 1 Apr 2015 19:09:33 +0000 (19:09 +0000)]
Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev
Andrew Solovay [Wed, 1 Apr 2015 18:32:46 +0000 (18:32 +0000)]
am
79c587ed: am
aabcf5b5: am
b2255d4f: docs: Fixed a typo.
* commit '
79c587eda40f3af622f9d1b81aa5a81682e985e4':
docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:21:31 +0000 (18:21 +0000)]
am
aabcf5b5: am
b2255d4f: docs: Fixed a typo.
* commit '
aabcf5b562b6ebad59d1789c73d054782d5f25e4':
docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:11:01 +0000 (18:11 +0000)]
am
b2255d4f: docs: Fixed a typo.
* commit '
b2255d4f10230b51de373528aaee7b12cc9e2f2b':
docs: Fixed a typo.
Bryce Lee [Wed, 1 Apr 2015 17:57:21 +0000 (10:57 -0700)]
Do not use the status bar as the system decor layer if it is not visible.
Doing so leads to cropping of the content view, which is smaller than the
screen size on some devices with improperly configured overscan values. It
can also lead to performance issues with some activity transition
animations on Wear.
Bug:
19928768
Change-Id: Ic50c2fedb1f8be9a8ea5166fef5a5665958601de
Alex Klyubin [Wed, 1 Apr 2015 17:57:06 +0000 (17:57 +0000)]
am
c461452e: Merge "Hook in user authenticators and their exceptions."
* commit '
c461452eb78867032092b2fce14c2fcb3e7ab34e':
Hook in user authenticators and their exceptions.
Alex Klyubin [Wed, 1 Apr 2015 17:57:00 +0000 (17:57 +0000)]
am
c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
* commit '
c6cc9d820d007a6b11df2bb3274d40743e1f1d87':
A way to obtain KeyStore operation handle from crypto primitives.
Olawale Ogunwale [Wed, 1 Apr 2015 17:56:53 +0000 (17:56 +0000)]
am
086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"
* commit '
086071e7306a73c9b3c5a56277884b4e19543b3e':
[ActivityManager] Reduce report wrong anr activity
Alex Klyubin [Wed, 1 Apr 2015 17:34:36 +0000 (17:34 +0000)]
Merge "Hook in user authenticators and their exceptions."
Alex Klyubin [Wed, 1 Apr 2015 17:34:08 +0000 (17:34 +0000)]
Merge "A way to obtain KeyStore operation handle from crypto primitives."
Olawale Ogunwale [Wed, 1 Apr 2015 17:32:37 +0000 (17:32 +0000)]
Merge "[ActivityManager] Reduce report wrong anr activity"
Mark Salyzyn [Wed, 1 Apr 2015 17:11:11 +0000 (17:11 +0000)]
am
c90a4418: Merge "idmap: scan missing include for sys/stat.h"
* commit '
c90a44184f775863f4cb7698ed7f92d7b2d83e60':
idmap: scan missing include for sys/stat.h
Mark Salyzyn [Wed, 1 Apr 2015 16:53:53 +0000 (16:53 +0000)]
Merge "idmap: scan missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 14:48:34 +0000 (07:48 -0700)]
idmap: scan missing include for sys/stat.h
scan.cpp gets sys/stat.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for sys/stat.h in this
include file.
Bug:
19908228
Change-Id: If547e86513b06c536972138ae571c3d9c714ffe9
Mark Salyzyn [Wed, 1 Apr 2015 16:49:02 +0000 (16:49 +0000)]
am
5218065d: Merge "app_main missing include for sys/stat.h"
* commit '
5218065dec34abdb15ee2fb5fffa86207b6b57a8':
app_main missing include for sys/stat.h
Luan Nguyen [Tue, 31 Mar 2015 19:32:53 +0000 (12:32 -0700)]
docs: Add voice intent for starting a stopwatch
bug:
19931486
Change-Id: I9895966da1203e1f95ac29a61f9613548b8f2177
Mark Salyzyn [Wed, 1 Apr 2015 16:28:04 +0000 (16:28 +0000)]
Merge "app_main missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 14:36:23 +0000 (07:36 -0700)]
app_main missing include for sys/stat.h
app_main.c gets sys/stat.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for sys/stat.h in this
include file.
Bug:
19908228
Change-Id: I477b825e582742113f849aaa1df50c41e496b6f6
Olawale Ogunwale [Wed, 1 Apr 2015 15:18:45 +0000 (15:18 +0000)]
am
6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"
* commit '
6091dcbb80d3b1b885b6e02386ccb3139e5e43ae':
[ActivityManager] Improve multi-thread access the same provider
Olawale Ogunwale [Wed, 1 Apr 2015 14:58:20 +0000 (14:58 +0000)]
Merge "[ActivityManager] Improve multi-thread access the same provider"
riddle_hsu [Wed, 1 Apr 2015 10:58:07 +0000 (18:58 +0800)]
[ActivityManager] Reduce report wrong anr activity
Symptom:
Report ANR on wrong activity.
Reproduce steps:
(All launchMode, taskAffinity are default and
without additional intent flag)
Case 1:
1.Launch activity A from launcher.
2.Activity A starts B activity.
3.Press home key.
4.Launch activity A from launcher (B is top).
5.Press back key twice to finish B and A,
A sleep 10s in onResume.
6.ANR will report on launcher.
Case 2:
1.Launch activity A from launcher.
2.Press home key.
3.Kill process of A.
4.Launch activity A from launcher.
5.A sleep 10s in onResume, press back key immediately.
6.ANR will report on launcher.
Possible root cause:
Focused activity will not be updated every time when activity
resumed. (the condition to call setFocusedActivityLocked)
Case 1:
Launcher was stopped and not waitingVisible due to launcher
is not the previous one, then getWaitingHistoryRecordLocked
has no chance to correct the real ANR activity.
Case 2:
Due to process of next activity is died, bring existed
task will not set mResumedActivity (it will be set when its
process is started), so when assigning waitingVisible from
processStoppingActivitiesLocked, the return value of
allResumedActivitiesVisible will be true even there is no
mResumedActivity. That results set waitingVisible to false
to previous activity (e.g. launcher), then also cannot
correct ANR target as case 1.
Change-Id: I0b24f46a8fab266382ebc6e2ed84ebeca9358768
Geoff Mendal [Wed, 1 Apr 2015 10:07:56 +0000 (10:07 +0000)]
am
568039dd: (-s ours) Import translations. DO NOT MERGE
* commit '
568039dda61f9245cd37901c5c2284e6cc79bda4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 09:46:18 +0000 (02:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I488ba02367861ca1c84acd44e1a7aaee31e71108
Auto-generated-cl: translation import
riddle_hsu [Wed, 1 Apr 2015 07:06:18 +0000 (15:06 +0800)]
[ActivityManager] Improve multi-thread access the same provider
Application may use many threads to load data from provider.
If the target provider needs to start process, each access
will occupy one binder thread of system server until the
provider process started and published.
Sometimes application uses more than 16 threads to access
the same provider, and the provider process needs a little
long time to start, then all binder threads of system server
are waiting. But when the provider is ready, it is unable to
publish to notify those waiting threads because no availabe
binder thread to use. And device will become almost hang.
Improvement:
If there is already a thread acquiring provider, let other threads
(which try to acquire the same provider) wait the result of the
first one. That reduces IPC to save binder thread of system server.
Remove calling removeContentProvider in installProvider because
we have ensured only get one provider holder for the same provider,
the original race that gets a new useless holder will not happen.
Change-Id: I521f2603db8ced56912f5dc54342a70451e68381
Alex Klyubin [Wed, 1 Apr 2015 03:55:10 +0000 (20:55 -0700)]
A way to obtain KeyStore operation handle from crypto primitives.
This adds AndroidKeyStore.getKeyStoreOperationHandle method which can
be used to obtain the KeyStore operation handle corresponding to the
provided JCA cryto primitive (provided it's backed by
AndroidKeyStore).
Bug:
18088752
Change-Id: Iaa3b6f9b2281b2ec2de8fd5946d353dc7fdb3d2d
Andrew Solovay [Tue, 31 Mar 2015 19:10:47 +0000 (12:10 -0700)]
docs: Fixed a typo.
See first comment for doc stage location.
bug:
19709151
Change-Id: I182cb76c55acd32da921420b3ef37d330cf63bb0
Alex Klyubin [Wed, 1 Apr 2015 02:50:13 +0000 (19:50 -0700)]
Hook in user authenticators and their exceptions.
Bug:
18088752
Change-Id: I2835dbe51d09587a3081597c6aaf536aa1427e24
Alex Klyubin [Wed, 1 Apr 2015 01:27:54 +0000 (01:27 +0000)]
am
562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
* commit '
562c6a71f98e921fe8def18991b2a26f153c683d':
UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
Alex Klyubin [Wed, 1 Apr 2015 01:27:48 +0000 (01:27 +0000)]
am
b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."
* commit '
b7a34e4955beae2cee81a27e7c240316078bbf2f':
Add license banner to recently added AndroidKeyStore files.
Alex Klyubin [Wed, 1 Apr 2015 01:27:41 +0000 (01:27 +0000)]
am
19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
* commit '
19e79e12d82fa473f2f7beec337de11a0c3b3a03':
Add SecretKeyFactory backed by AndroidKeyStore.
Craig Mautner [Wed, 1 Apr 2015 01:27:34 +0000 (01:27 +0000)]
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
Yang Ni [Wed, 1 Apr 2015 01:27:27 +0000 (01:27 +0000)]
am
63dde9c8: Merge "Fix value size data type in closure creation."
* commit '
63dde9c88d780fc16a4f2471e405b4f5dc35823c':
Fix value size data type in closure creation.
Alex Klyubin [Wed, 1 Apr 2015 00:47:00 +0000 (00:47 +0000)]
Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
Alex Klyubin [Wed, 1 Apr 2015 00:16:31 +0000 (17:16 -0700)]
UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
This is to follow naming from keymaster_defs.h
Bug:
18088752
Change-Id: If2bc91dde54f1cefcd4325d1f62d0e0b77fc5d59
Alex Klyubin [Tue, 31 Mar 2015 23:52:45 +0000 (23:52 +0000)]
Merge "Add license banner to recently added AndroidKeyStore files."
Alex Klyubin [Tue, 31 Mar 2015 23:50:37 +0000 (16:50 -0700)]
Add license banner to recently added AndroidKeyStore files.
Bug:
18088752
Change-Id: I027f9530a02cca081aae8eb94833d2fdcb678e9a
Alex Klyubin [Tue, 31 Mar 2015 23:32:40 +0000 (23:32 +0000)]
Merge "Add SecretKeyFactory backed by AndroidKeyStore."
Alex Klyubin [Tue, 31 Mar 2015 22:26:56 +0000 (15:26 -0700)]
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
Craig Mautner [Tue, 31 Mar 2015 22:22:46 +0000 (22:22 +0000)]
Merge "Clear the previous states before setting the new app visibility"
Yang Ni [Tue, 31 Mar 2015 21:32:23 +0000 (21:32 +0000)]
Merge "Fix value size data type in closure creation."
Alex Klyubin [Tue, 31 Mar 2015 21:13:49 +0000 (21:13 +0000)]
am
5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
* commit '
5960c3d56614830439718e93968e0c7d2727262f':
Add unauthenticated AES ciphers backed by AndroidKeyStore.
Alex Klyubin [Tue, 31 Mar 2015 21:00:16 +0000 (21:00 +0000)]
Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
Alex Klyubin [Tue, 31 Mar 2015 20:39:38 +0000 (13:39 -0700)]
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
Kenny Root [Tue, 31 Mar 2015 19:14:48 +0000 (19:14 +0000)]
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
Kenny Root [Tue, 31 Mar 2015 19:10:48 +0000 (19:10 +0000)]
Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
Chad Brubaker [Tue, 31 Mar 2015 18:03:21 +0000 (18:03 +0000)]
am
5491ea9e: Merge "Include operation handle in OperationResult"
* commit '
5491ea9e5bc6ce8eb0dc2e91e46608f6aa3e7dfc':
Include operation handle in OperationResult
Chad Brubaker [Tue, 31 Mar 2015 17:49:15 +0000 (17:49 +0000)]
Merge "Include operation handle in OperationResult"
Svetoslav [Tue, 31 Mar 2015 16:46:44 +0000 (16:46 +0000)]
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
Kenny Root [Tue, 31 Mar 2015 16:46:39 +0000 (16:46 +0000)]
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
Svetoslav [Tue, 31 Mar 2015 16:41:00 +0000 (16:41 +0000)]
am
c6be7545: am
37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
* commit '
c6be7545b4106b9ba586e365f2d2ab911cafea93':
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
Kenny Root [Tue, 31 Mar 2015 16:40:14 +0000 (16:40 +0000)]
Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
Svetoslav [Tue, 31 Mar 2015 16:33:21 +0000 (16:33 +0000)]
am
37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
* commit '
37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
Olawale Ogunwale [Tue, 31 Mar 2015 16:21:03 +0000 (16:21 +0000)]
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.
Kenny Root [Tue, 31 Mar 2015 16:11:34 +0000 (09:11 -0700)]
Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
This reverts commit
693ea60e9e3d2ef476e4f45caac234360d90bdb9.
Bug:
19894176
Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b
Kenny Root [Tue, 31 Mar 2015 16:09:42 +0000 (09:09 -0700)]
Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
This reverts commit
4ff668d47ab9f49ec81606aec6d469ecd6ca37fa.
Bug:
19894176
Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd
Olawale Ogunwale [Tue, 31 Mar 2015 16:09:16 +0000 (16:09 +0000)]
Merge "[ActivityManager] Fix index out of bounds when updating next pss time."
Neil Fuller [Tue, 31 Mar 2015 09:31:48 +0000 (09:31 +0000)]
am
25c5296b: Merge "An updater for all timezone data on a device"
* commit '
25c5296b0d85979ad216195000b857dce8127ab1':
An updater for all timezone data on a device
Neil Fuller [Tue, 31 Mar 2015 08:30:59 +0000 (08:30 +0000)]
Merge "An updater for all timezone data on a device"
riddle_hsu [Tue, 31 Mar 2015 03:54:14 +0000 (11:54 +0800)]
[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
Andreas Gampe [Tue, 31 Mar 2015 03:31:36 +0000 (03:31 +0000)]
am
02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property"
* commit '
02c4bbb9648da99947da57b1605020340a334b5f':
Frameworks/base: Support dex2oat threads system property
Andreas Gampe [Tue, 31 Mar 2015 03:20:09 +0000 (03:20 +0000)]
Merge "Frameworks/base: Support dex2oat threads system property"
Andreas Gampe [Tue, 31 Mar 2015 01:43:39 +0000 (18:43 -0700)]
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
Svetoslav [Thu, 29 Jan 2015 00:44:02 +0000 (16:44 -0800)]
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)
Olawale Ogunwale [Mon, 30 Mar 2015 23:25:15 +0000 (23:25 +0000)]
am
4af5bd7c: Merge "Add ProcessInfoService to activity manager."
* commit '
4af5bd7cdaccdba6001a384a81c258f542e74075':
Add ProcessInfoService to activity manager.
Olawale Ogunwale [Mon, 30 Mar 2015 22:00:08 +0000 (22:00 +0000)]
Merge "Add ProcessInfoService to activity manager."
Rich Slogar [Mon, 30 Mar 2015 21:42:58 +0000 (21:42 +0000)]
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
Rich Slogar [Mon, 30 Mar 2015 21:37:05 +0000 (21:37 +0000)]
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
Rich Slogar [Mon, 30 Mar 2015 21:30:39 +0000 (21:30 +0000)]
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
Rich Slogar [Mon, 30 Mar 2015 21:24:19 +0000 (21:24 +0000)]
Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
Alex Klyubin [Mon, 30 Mar 2015 20:47:15 +0000 (20:47 +0000)]
am
6a6f0c7d: Merge "Add HmacSHA256 backed by AndroidKeyStore."
* commit '
6a6f0c7de263743dc22b046dd9d53c694bce3ac5':
Add HmacSHA256 backed by AndroidKeyStore.
Alex Klyubin [Mon, 30 Mar 2015 20:34:47 +0000 (20:34 +0000)]
Merge "Add HmacSHA256 backed by AndroidKeyStore."
Chad Brubaker [Mon, 30 Mar 2015 20:18:34 +0000 (20:18 +0000)]
am
f603e286: Merge "Add authorization binder methods"
* commit '
f603e2861430f13a746f80885b5fc00994f64391':
Add authorization binder methods
Chad Brubaker [Mon, 30 Mar 2015 20:06:29 +0000 (20:06 +0000)]
Merge "Add authorization binder methods"
Alex Klyubin [Fri, 27 Mar 2015 23:53:44 +0000 (16:53 -0700)]
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
Ruben Brunk [Wed, 28 Jan 2015 23:04:16 +0000 (15:04 -0800)]
Add ProcessInfoService to activity manager.
- Adds a new AIDL interface for querying process
information from activity manager.
Bug:
19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
Yang Ni [Thu, 26 Mar 2015 21:35:22 +0000 (14:35 -0700)]
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
Geoff Mendal [Mon, 30 Mar 2015 14:49:09 +0000 (14:49 +0000)]
am
6e6250b9: (-s ours) Import translations. DO NOT MERGE
* commit '
6e6250b9613e7c236a07367fc800feece8bcd706':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 30 Mar 2015 14:38:42 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I386da39a3fc78ac9e7878f8962bb4a513d907893
Auto-generated-cl: translation import
Mathieu Chartier [Sun, 29 Mar 2015 22:42:53 +0000 (22:42 +0000)]
am
631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '
631565abd6cadd65befe197afa7bac0d44f70fb2':
Change getDeclaredFieldsUnchecked call to new return value
Mathieu Chartier [Sun, 29 Mar 2015 22:30:41 +0000 (22:30 +0000)]
Merge "Change getDeclaredFieldsUnchecked call to new return value"
Andreas Gampe [Sat, 28 Mar 2015 05:03:25 +0000 (05:03 +0000)]
am
a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '
a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
Frameworks/base: Change String == to equals in Preference
Andreas Gampe [Sat, 28 Mar 2015 05:03:18 +0000 (05:03 +0000)]
am
5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '
5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
Frameworks/base: Fix request removal in VoiceInteractionSession
Andreas Gampe [Sat, 28 Mar 2015 04:50:42 +0000 (04:50 +0000)]
Merge "Frameworks/base: Change String == to equals in Preference"
Andreas Gampe [Sat, 28 Mar 2015 04:50:07 +0000 (04:50 +0000)]
Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
Mathieu Chartier [Wed, 25 Mar 2015 20:35:38 +0000 (13:35 -0700)]
Change getDeclaredFieldsUnchecked call to new return value
Required for related libcore change.
Bug:
19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
Alex Klyubin [Fri, 27 Mar 2015 23:26:08 +0000 (23:26 +0000)]
am
36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '
36ee836d2f6e6df59d6a20a69421639bacf25559':
Symmetric key generation for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 23:25:59 +0000 (23:25 +0000)]
am
dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '
dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
Allow entropy to be provided to some operations
Bart Sears [Fri, 27 Mar 2015 23:08:46 +0000 (23:08 +0000)]
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
Alex Klyubin [Fri, 27 Mar 2015 22:59:18 +0000 (22:59 +0000)]
Merge "Symmetric key generation for AndroidKeyStore."
Alex Klyubin [Fri, 27 Mar 2015 21:39:28 +0000 (14:39 -0700)]
Symmetric key generation for AndroidKeyStore.
This currently supports AES and HMAC with SHA-256.
Bug:
18088752
Change-Id: Ife55438cf4129b895295681bb35091cd37eb73fb
Alex Klyubin [Fri, 27 Mar 2015 21:42:08 +0000 (21:42 +0000)]
am
274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '
274a4ee3446e76a34a9cfe987e98f7bf4e53f78d':
Symmetric key import for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 21:38:43 +0000 (21:38 +0000)]
Merge "Allow entropy to be provided to some operations"
Chad Brubaker [Fri, 27 Mar 2015 21:28:35 +0000 (14:28 -0700)]
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
Bart Sears [Fri, 27 Mar 2015 21:23:01 +0000 (21:23 +0000)]
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
Bart Sears [Fri, 27 Mar 2015 21:14:37 +0000 (21:14 +0000)]
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