OSDN Git Service
Scott Rowe [Wed, 1 Apr 2015 21:58:23 +0000 (21:58 +0000)]
am
0f2f0350: am
5f78af44: am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
0f2f03506654e6669db64147e9f22340c24629e8':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:46:45 +0000 (21:46 +0000)]
am
5f78af44: am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
5f78af44bd9627dace7db4ce47fdf61cf8d78b42':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:35:39 +0000 (21:35 +0000)]
am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
a03245a343fe7906e4459b6a4dfcc41f60c56fd6':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:25:53 +0000 (21:25 +0000)]
am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
4fc3d3ff404c777e07616b704c68176d9060c4e4':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:05:41 +0000 (21:05 +0000)]
Merge "docs: Building Live TV Apps" into lmp-docs
Alex Klyubin [Wed, 1 Apr 2015 20:48:17 +0000 (20:48 +0000)]
am
39b99186: am
97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
* commit '
39b9918631061340361b7776ace9b9cd4b25be7c':
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
Alex Klyubin [Wed, 1 Apr 2015 20:38:07 +0000 (20:38 +0000)]
am
97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
* commit '
97467d82a31964e36cb6bc32ac4cf00e884c190e':
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
Alex Klyubin [Wed, 1 Apr 2015 20:31:42 +0000 (20:31 +0000)]
am
78014a78: am
04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '
78014a78155ad05ca2e0af600c0545377c04bdbd':
Use Keymaster-friendly validity dates.
Alex Klyubin [Wed, 1 Apr 2015 20:21:00 +0000 (20:21 +0000)]
am
04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '
04047af628338aa7859ae1f24700e1e4e3ae63e7':
Use Keymaster-friendly validity dates.
Andreas Gampe [Wed, 1 Apr 2015 20:15:59 +0000 (20:15 +0000)]
am
7598a248: am
e816f917: Merge "Frameworks/base: Use system property for cache prune counter"
* commit '
7598a248bdbeb58a4b40ad773f39137b0dde1137':
Frameworks/base: Use system property for cache prune counter
Luan Nguyen [Wed, 1 Apr 2015 20:15:55 +0000 (20:15 +0000)]
am
e5bc03da: am
d7fe75d6: am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
e5bc03da07489d603df4e02754e061b37b5978d0':
docs: Update ambient mode to mention disabling bitmap filtering
Alex Klyubin [Wed, 1 Apr 2015 20:15:52 +0000 (20:15 +0000)]
Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
Luan Nguyen [Wed, 1 Apr 2015 20:15:50 +0000 (20:15 +0000)]
am
0c50a4f1: am
13803e43: am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
0c50a4f15cdd120eae331545888982dccdb7b8aa':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Luan Nguyen [Wed, 1 Apr 2015 20:15:46 +0000 (20:15 +0000)]
am
b79d9912: am
b9b2801d: am
b2bd8f8a: am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
b79d9912c7f54ca5c5f496753ee4a316e78ac17b':
docs: Add voice intent for starting a stopwatch
Andreas Gampe [Wed, 1 Apr 2015 20:10:22 +0000 (20:10 +0000)]
am
e816f917: Merge "Frameworks/base: Use system property for cache prune counter"
* commit '
e816f917e0e1c21c8019436744284630f2408dc0':
Frameworks/base: Use system property for cache prune counter
Alex Klyubin [Wed, 1 Apr 2015 17:59:29 +0000 (10:59 -0700)]
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
This makes the hidden API android.net.Uri.toSafeString omit most parts
of HTTP, HTTPS, and FTP URLs to avoid leaking anything unsafe. Only
the host and port are retained for these URLs.
Bug:
19215516
Change-Id: I2e9e33d9afaa9de5dd07a40532d56f0a2179f62a
Luan Nguyen [Wed, 1 Apr 2015 20:05:17 +0000 (20:05 +0000)]
am
d7fe75d6: am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
d7fe75d687935060557920ff2e515b7246958405':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 20:05:11 +0000 (20:05 +0000)]
am
13803e43: am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
13803e43b3196378d26fac8104d211b1224cb9f1':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
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
Alex Klyubin [Wed, 1 Apr 2015 20:01:00 +0000 (20:01 +0000)]
Merge "Use Keymaster-friendly validity dates."
Luan Nguyen [Wed, 1 Apr 2015 19:55:08 +0000 (19:55 +0000)]
am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
92aa846daf64119d5951453c0298f83115f26d48':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 19:55:02 +0000 (19:55 +0000)]
am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
03bafac781492fed392cb6bcdc8773a44076c705':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
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
Andreas Gampe [Wed, 1 Apr 2015 19:52:26 +0000 (19:52 +0000)]
Merge "Frameworks/base: Use system property for cache prune counter"
Andreas Gampe [Tue, 31 Mar 2015 23:15:17 +0000 (16:15 -0700)]
Frameworks/base: Use system property for cache prune counter
Expose ART's -Xzygote-max-boot-retry through a new system property
dalvik.vm.zygote.max-boot-retry.
Bug:
19983101
Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
Luan Nguyen [Wed, 1 Apr 2015 19:43:57 +0000 (19:43 +0000)]
am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
d01ada25155ed82644b9cc23313c04d3f1a5721a':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 19:43:54 +0000 (19:43 +0000)]
am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
649d839b82a8fafc99ae79ba1ad5fc12218391cb':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
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
Bryce Lee [Wed, 1 Apr 2015 19:27:27 +0000 (19:27 +0000)]
am
7eeaad24: 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 '
7eeaad244cbd3ac49530b414fda29d8b23fae8ae':
Do not use the status bar as the system decor layer if it is not visible.
Luan Nguyen [Wed, 1 Apr 2015 19:24:29 +0000 (19:24 +0000)]
Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
Luan Nguyen [Wed, 1 Apr 2015 19:23:20 +0000 (19:23 +0000)]
Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
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
Scott Rowe [Thu, 5 Feb 2015 19:46:10 +0000 (11:46 -0800)]
docs: Building Live TV Apps
Change-Id: I8d0015e6c8a8a24c661434ca5cf88defd27ae8cf
Andrew Solovay [Wed, 1 Apr 2015 18:43:15 +0000 (18:43 +0000)]
am
3e3af524: am
79c587ed: am
aabcf5b5: am
b2255d4f: docs: Fixed a typo.
* commit '
3e3af5247f7d811f0427bbc1f39fc0582e05f374':
docs: Fixed a typo.
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.
Alex Klyubin [Wed, 1 Apr 2015 18:04:58 +0000 (18:04 +0000)]
am
a4ea4726: am
c461452e: Merge "Hook in user authenticators and their exceptions."
* commit '
a4ea47269040963301101b1b1a28d598b41219b8':
Hook in user authenticators and their exceptions.
Alex Klyubin [Wed, 1 Apr 2015 18:04:54 +0000 (18:04 +0000)]
am
f00cdf68: am
c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
* commit '
f00cdf68cd1b96f822b3711cd4e39c9ad903ce21':
A way to obtain KeyStore operation handle from crypto primitives.
Olawale Ogunwale [Wed, 1 Apr 2015 18:04:50 +0000 (18:04 +0000)]
am
4e88ecf4: am
086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"
* commit '
4e88ecf4bc344557af31eb367e6e01b2d5b60471':
[ActivityManager] Reduce report wrong anr activity
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 03:19:54 +0000 (20:19 -0700)]
Use Keymaster-friendly validity dates.
Keymaster HAL currently requires that key validity start and end dates
always be specified. The framework API does not. This CL expresses
the framework API's "not specified" instants to Keymaster as instants
in distant past or future.
Bug:
18088752
Change-Id: Ia9d66d5e57bfca30628cdef6e0925a2781a3acfb
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:20:54 +0000 (17:20 +0000)]
am
855998d0: am
c90a4418: Merge "idmap: scan missing include for sys/stat.h"
* commit '
855998d0d1a78b1ab1ba8f012cdadd57f3d942dd':
idmap: scan missing include for sys/stat.h
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:59:44 +0000 (16:59 +0000)]
am
f942e36a: am
5218065d: Merge "app_main missing include for sys/stat.h"
* commit '
f942e36a07e8c5e93c1084294350905cebc817a9':
app_main 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"
Luan Nguyen [Fri, 13 Feb 2015 19:07:44 +0000 (11:07 -0800)]
docs: Remove misleading information about hardware layer performance
benefits for optimizing views.
bug:
18356775
Change-Id: Ideac15f1eb42fe4c2e291800458bf739cd6a9b4a
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:28:16 +0000 (15:28 +0000)]
am
259a649a: am
6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"
* commit '
259a649a935ca2ed63419a079211b0ac35f67496':
[ActivityManager] Improve multi-thread access the same provider
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:18:24 +0000 (10:18 +0000)]
am
22c93045: (-s ours) am
568039dd: (-s ours) Import translations. DO NOT MERGE
* commit '
22c930457a3f5848ec699fc79e38c4c0d2e5963a':
Import translations. DO NOT MERGE
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:55:00 +0000 (02:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I88cb981996fd8f533071e0819c314f63d7036cb1
Auto-generated-cl: translation import
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 02:05:45 +0000 (02:05 +0000)]
am
b48ebf48: am
562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
* commit '
b48ebf4855ec9e158ee88d05618928ff8f5943d1':
UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
Alex Klyubin [Wed, 1 Apr 2015 02:05:41 +0000 (02:05 +0000)]
am
01e53ef1: am
b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."
* commit '
01e53ef1fc5e3004bfb627d252565305df9a4056':
Add license banner to recently added AndroidKeyStore files.
Alex Klyubin [Wed, 1 Apr 2015 02:05:37 +0000 (02:05 +0000)]
am
9c0f257f: am
19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
* commit '
9c0f257f0080aba0743f34fb6202215fca295146':
Add SecretKeyFactory backed by AndroidKeyStore.
Craig Mautner [Wed, 1 Apr 2015 02:05:33 +0000 (02:05 +0000)]
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
Yang Ni [Wed, 1 Apr 2015 02:05:27 +0000 (02:05 +0000)]
am
5db6f1fa: am
63dde9c8: Merge "Fix value size data type in closure creation."
* commit '
5db6f1fafa4990b2d583dcb407be361edc02019d':
Fix value size data type in closure creation.
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:20:51 +0000 (21:20 +0000)]
am
0bd10c21: am
5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
* commit '
0bd10c21ff1bb00f178738301ad4663c7cebd28f':
Add unauthenticated AES ciphers backed by AndroidKeyStore.
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:22:17 +0000 (19:22 +0000)]
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
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:10:02 +0000 (18:10 +0000)]
am
826d6357: am
5491ea9e: Merge "Include operation handle in OperationResult"
* commit '
826d63572be4b23ad2f70f3004d520d54ef4dc01':
Include operation handle in OperationResult
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"