OSDN Git Service
Mathieu Chartier [Tue, 28 Apr 2015 23:40:31 +0000 (23:40 +0000)]
Merge "Properly describe exception"
Mathieu Chartier [Tue, 28 Apr 2015 23:30:30 +0000 (16:30 -0700)]
Properly describe exception
Previously we used DetachCurrentThread which raised a SIGABRT from
within ART. The new approach is to use ExceptionDescribe and exit.
Bug:
20640601
Change-Id: Ia6c2345b656b2ada29d262399798a6ed717a7f85
Chad Brubaker [Tue, 28 Apr 2015 20:34:29 +0000 (20:34 +0000)]
Merge "Add OP_AUTH_NEEDED KeyStore result code"
Alan Viverette [Tue, 28 Apr 2015 17:10:40 +0000 (17:10 +0000)]
Merge "Fix for infinite loop in RemoteViewsAdapter"
Marco Nelissen [Tue, 28 Apr 2015 15:26:52 +0000 (15:26 +0000)]
Merge "Sometimes the application context is null"
Narayan Kamath [Tue, 28 Apr 2015 08:32:55 +0000 (08:32 +0000)]
Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"
Taiju Tsuiki [Tue, 28 Apr 2015 04:36:15 +0000 (13:36 +0900)]
Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
Add a null check for each values of SparseArray in Bundle#hasFileDescriptor
to avoid NullPointerException.
Change-Id: I43ecc01f2759ccbe85b902fa118d55cb74ebf38b
Narayan Kamath [Tue, 28 Apr 2015 08:29:09 +0000 (08:29 +0000)]
Merge "Fix NullPointerException in Bundle#hasFileDescriptors"
Taiju Tsuiki [Wed, 22 Apr 2015 07:59:00 +0000 (16:59 +0900)]
Fix NullPointerException in Bundle#hasFileDescriptors
Add null check for array elements in Bundle#hasFileDescriptors to avoid NPE on
null valued array.
Change-Id: Ic6ef8864ca6add023c7a69ba3c9474b0f6291723
Andreas Gampe [Mon, 27 Apr 2015 15:06:46 +0000 (15:06 +0000)]
Merge "Frameworks/base: Add debug.gencfi property"
Narayan Kamath [Mon, 27 Apr 2015 10:44:34 +0000 (10:44 +0000)]
Merge "Fix incorrect javadoc for Uri.getQueryParameter."
Narayan Kamath [Mon, 27 Apr 2015 10:00:54 +0000 (11:00 +0100)]
Fix incorrect javadoc for Uri.getQueryParameter.
This first went out with Jelly Bean and not ICS.
bug: https://code.google.com/p/android/issues/detail?id=61651
Change-Id: I26f6b18593fe089bd3a52ec1d159494923bcbad1
Nick Kralevich [Sat, 25 Apr 2015 21:22:31 +0000 (21:22 +0000)]
Merge "fix compiler error under FORTIFY_SOURCE=2"
Nick Kralevich [Sat, 25 Apr 2015 03:25:50 +0000 (20:25 -0700)]
fix compiler error under FORTIFY_SOURCE=2
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
ftruncate(fd, mFooterStart);
^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1
Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
Andreas Gampe [Fri, 24 Apr 2015 23:28:48 +0000 (16:28 -0700)]
Frameworks/base: Add debug.gencfi property
Add the debug.gencfi system property that forces generation of
CFI data.
Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
Wale Ogunwale [Fri, 24 Apr 2015 21:49:45 +0000 (21:49 +0000)]
Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
Wale Ogunwale [Fri, 24 Apr 2015 21:49:41 +0000 (21:49 +0000)]
Merge "Revert "Clean-up state if we have an exception when acquiring provider""
Wale Ogunwale [Fri, 24 Apr 2015 21:45:14 +0000 (14:45 -0700)]
Revert "[ActivityManager] Improve multi-thread access the same provider"
This reverts commit
57307b21cbdb261eeca081051ed61540dcf905f8.
Bug:
20091132
Wale Ogunwale [Fri, 24 Apr 2015 21:44:54 +0000 (14:44 -0700)]
Revert "Clean-up state if we have an exception when acquiring provider"
This reverts commit
73e239bdc9493d81215d5afe739b3ed095686ba2.
Bug:
20091132
Kenny Root [Fri, 24 Apr 2015 21:26:06 +0000 (21:26 +0000)]
Merge "frameworks/base: switch to using NativeConstants."
Alex Klyubin [Fri, 24 Apr 2015 20:00:57 +0000 (20:00 +0000)]
Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
Chad Brubaker [Fri, 24 Apr 2015 17:32:18 +0000 (10:32 -0700)]
Add OP_AUTH_NEEDED KeyStore result code
OP_AUTH_NEEDED will be returned from begin when an operation needs
a per operation authentication before calling update. Note that the
begin call succeeds when this error is returned, the token and handle
are valid.
Change-Id: I28953add4ffd7d873fc33ba3f2cf788f72b07d06
Alex Klyubin [Tue, 21 Apr 2015 22:17:24 +0000 (15:17 -0700)]
No runtime exceptions during normal use of AndroidKeyStore crypto.
This changes the implementation of AndroidKeyStore-backed Cipher and
Mac to avoid throwing runtime exceptions during normal use. Runtime
exceptions will now be thrown only due to truly exceptional and
unrecoverable errors (e.g., keystore unreachable, or crypto primitive
not initialized).
This also changes the implementation of Cipher to cache any errors
encountered in Cipher.update until Cipher.doFinal which then throws
them as checked exceptions.
Bug:
20525947
Change-Id: I3c4ad57fe70abfbb817a79402f722a0208660727
Alex Klyubin [Fri, 24 Apr 2015 17:52:35 +0000 (17:52 +0000)]
Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
Alex Klyubin [Fri, 24 Apr 2015 17:47:17 +0000 (10:47 -0700)]
Reset AndroidKeyStore Mac and Cipher state when init fails.
For consistency, this also switches AndroidKeyStore's Mac init/reset
implementation to the same approach as used in Cipher.
Bug:
18088752
Change-Id: Id34caf7cfe04f2058e22d8632890f762927bb31c
Olawale Ogunwale [Fri, 24 Apr 2015 17:42:58 +0000 (17:42 +0000)]
Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
Adam Langley [Fri, 24 Apr 2015 16:59:35 +0000 (09:59 -0700)]
frameworks/base: switch to using NativeConstants.
NativeCrypto is a conscrypt class that contained several OpenSSL
constants. NativeConstants is the new class that contains the same
thing, but the latter is automatically generated and thus won't drift
from the C headers.
Bug:
20521989
Change-Id: I45c7b9a6844a06e3ffd09be692ebf733e1ebbbcc
Neil Fuller [Fri, 24 Apr 2015 10:30:16 +0000 (10:30 +0000)]
Merge "Load ICU4J data on boot"
Neil Fuller [Thu, 23 Apr 2015 13:50:34 +0000 (14:50 +0100)]
Load ICU4J data on boot
Bug:
20252074
Bug:
20396452
Change-Id: I17de761e0d81caa2fc280b5cc368ee6113a5d655
Yang Ni [Wed, 22 Apr 2015 23:14:34 +0000 (23:14 +0000)]
Merge "Move new script group API into ScriptGroup class"
Yang Ni [Fri, 17 Apr 2015 23:51:55 +0000 (16:51 -0700)]
Move new script group API into ScriptGroup class
And mark existing methods and builder deprecated.
Removed ScriptGroup2 class.
Renamed nested class UnboundValue to Input.
Marked classes Closure, Future, and Input as final.
Change-Id: I362910c115e9d0173dc515674e08bf4878232879
Marco Nelissen [Fri, 17 Apr 2015 16:50:56 +0000 (09:50 -0700)]
Sometimes the application context is null
when called from systemui.
Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: I27153a48d7edce7006517507d813e24ce6f63a7d
Marco Nelissen [Wed, 22 Apr 2015 20:08:36 +0000 (20:08 +0000)]
Merge "Revert "Sometimes the application context is null""
Marco Nelissen [Wed, 22 Apr 2015 20:07:15 +0000 (20:07 +0000)]
Revert "Sometimes the application context is null"
This reverts commit
d86281cb3da685672d89f964228980f6753adcae.
Change-Id: Icaf8e1e4812f64060066331f9000be15c134d1d2
Marco Nelissen [Wed, 22 Apr 2015 19:06:36 +0000 (19:06 +0000)]
Merge "Sometimes the application context is null"
Andreas Gampe [Tue, 21 Apr 2015 23:31:51 +0000 (23:31 +0000)]
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
Mathieu Chartier [Tue, 21 Apr 2015 23:03:33 +0000 (23:03 +0000)]
Merge "Update getExportedPropertyMethods to new reflection API"
Andreas Gampe [Mon, 20 Apr 2015 22:29:04 +0000 (15:29 -0700)]
Frameworks/base: Compile-time optimize SQLiteConnection
Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).
Bug:
19498458
Bug:
19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a
Mathieu Chartier [Fri, 17 Apr 2015 19:49:57 +0000 (12:49 -0700)]
Update getExportedPropertyMethods to new reflection API
Bug:
19264997
Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
Andreas Gampe [Tue, 21 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Frameworks/base: Fix comment"
Andreas Gampe [Tue, 21 Apr 2015 16:01:51 +0000 (09:01 -0700)]
Frameworks/base: Fix comment
Fix comment in ZygoteInit.
Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39
Olawale Ogunwale [Tue, 21 Apr 2015 15:31:58 +0000 (15:31 +0000)]
Merge "[ActivityManager] Move UI operation to UI handler"
riddle_hsu [Thu, 16 Apr 2015 04:45:48 +0000 (12:45 +0800)]
[ActivityManager] Move UI operation to UI handler
Because ANR will dump cpu usage, stack traces in ActivityManager
thread, if system is busy or in low-end device, it may spend more
than 5s to dump. So when there is UI operation (e.g. pop dialog)
in ActivityManager thread, it may meet key dispatch timeout.
Change-Id: Ie550e31a7cff65bdcfc9af2c32989e9deb5fb2cf
Olawale Ogunwale [Tue, 21 Apr 2015 15:29:09 +0000 (15:29 +0000)]
Merge "[ActivityManager] Avoid unnecessary restart provider process"
Marco Nelissen [Fri, 17 Apr 2015 16:50:56 +0000 (09:50 -0700)]
Sometimes the application context is null
when called from systemui.
Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: Ic7b98e39fd9ad2436b855cf9f7f53d3e7a1948c0
Craig Mautner [Tue, 21 Apr 2015 14:54:42 +0000 (14:54 +0000)]
Merge "Prevent infinite layout and wallpaper flashing"
Andreas Gampe [Tue, 21 Apr 2015 04:01:59 +0000 (04:01 +0000)]
Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
Andreas Gampe [Tue, 21 Apr 2015 02:16:37 +0000 (19:16 -0700)]
Frameworks/base: Use better Class.forName in ZygoteInit
Use the three-argument version of Class.forName. This saves an
expensive stack lookup for the caller's class-loader on each
invocation.
Bug:
19498458
Change-Id: I859affde31e580fd2de3f70ee0a9295936c2d9f4
Alex Klyubin [Mon, 20 Apr 2015 17:54:14 +0000 (17:54 +0000)]
Merge "Make MediaPlayer fail fast on UnknownServiceException."
Alex Klyubin [Mon, 20 Apr 2015 17:11:57 +0000 (10:11 -0700)]
Make MediaPlayer fail fast on UnknownServiceException.
This makes MediaPlayer's network streaming code fail fast when an
UnknownServiceException is encountered. This currently occurs when the
application declares that it does not perform cleartext network
traffic and tries to load media over cleartext HTTP. Without this CL,
MediaPlayer blocks for 30 seconds because it treats this error as
recoverable and goes into a ten retry loop with a three second delay
before each retry.
The result at MediaPlayer client level is
MediaPlayer.MEDIA_ERROR_UNKNOWN error. This error code is used for
non-recoverable situations such as when an invalid redirect is
encountered or the destination is unreachable.
Bug:
20026006
Change-Id: I10f0dadb7740902f8c7c73d0df96cfff31f08ada
Dmitriy Ivanov [Fri, 17 Apr 2015 19:01:40 +0000 (19:01 +0000)]
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dmitriy Ivanov [Fri, 17 Apr 2015 18:50:29 +0000 (11:50 -0700)]
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
It is no longer needed.
Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
Dan Albert [Fri, 17 Apr 2015 17:43:35 +0000 (17:43 +0000)]
Merge "Explicitly use clang."
Dan Albert [Fri, 17 Apr 2015 17:40:48 +0000 (10:40 -0700)]
Explicitly use clang.
This was implicitly enabled by using ASAN.
Change-Id: I562402a8191e2a3ab3eefd43860fbe7c58d441d8
Olawale Ogunwale [Fri, 17 Apr 2015 15:50:46 +0000 (15:50 +0000)]
Merge "[ActivityManager] Fix activity always visible."
Martijn Coenen [Fri, 17 Apr 2015 07:02:54 +0000 (07:02 +0000)]
Merge "Expose peer LLCP version in NDEF callbacks."
Chad Brubaker [Thu, 16 Apr 2015 21:56:10 +0000 (21:56 +0000)]
Merge "Support KM_LONG_REP"
Chad Brubaker [Thu, 16 Apr 2015 21:30:30 +0000 (14:30 -0700)]
Support KM_LONG_REP
Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0
Alex Klyubin [Thu, 16 Apr 2015 19:50:11 +0000 (19:50 +0000)]
Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."
Brian Carlstrom [Thu, 16 Apr 2015 17:07:58 +0000 (17:07 +0000)]
Merge "Document hprof-conv -z"
Brian Carlstrom [Fri, 27 Mar 2015 05:41:45 +0000 (22:41 -0700)]
Document hprof-conv -z
Bug:
18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
Alex Klyubin [Thu, 16 Apr 2015 16:39:30 +0000 (16:39 +0000)]
Merge "Add IV-related Keymaster error codes."
Alex Klyubin [Thu, 16 Apr 2015 16:39:07 +0000 (16:39 +0000)]
Merge "Remove IV auto-generation workaround."
riddle_hsu [Thu, 16 Apr 2015 03:36:23 +0000 (11:36 +0800)]
[ActivityManager] Avoid unnecessary restart provider process
Caller C accesses provider P. Both processes of C and P died
before P publishes, P will still be restarted even there is
no connection because P is in mLaunchingProviders.
When device is low memory, the restarting provider process
may be killed easily before publish because no caller to raise
its oom-adj. Then device will busy keeping restart it.
Solution:
If there is no connection to the provider, do not restart it.
Change-Id: If6f2d2258d78b6c0989c6e5f3e0cad14db821464
Miao Wang [Thu, 16 Apr 2015 02:03:26 +0000 (02:03 +0000)]
Merge "[RenderScript] typo fix in Allocation.java"
Miao Wang [Thu, 16 Apr 2015 00:44:32 +0000 (17:44 -0700)]
[RenderScript] typo fix in Allocation.java
Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
Alex Klyubin [Thu, 16 Apr 2015 00:20:23 +0000 (17:20 -0700)]
Remove IV auto-generation workaround.
This workaround prevents use of keys with randomized encryption
(IND-CPA). Since randomized encryption is on by default, it's better
to keep it working and break non-randomized encryption (until
Keymaster is fixed).
Bug:
18088752
Change-Id: I4b11ce72cff705be41d3e66f28b507d6ddc1da79
Alex Klyubin [Thu, 16 Apr 2015 00:16:23 +0000 (17:16 -0700)]
Add IV-related Keymaster error codes.
Bug:
18088752
Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
Tim Murray [Wed, 15 Apr 2015 22:30:12 +0000 (22:30 +0000)]
Merge "Add BNNM intrinsic."
Shawn Willden [Wed, 15 Apr 2015 17:37:35 +0000 (17:37 +0000)]
Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."
Michael Wright [Wed, 15 Apr 2015 10:53:20 +0000 (10:53 +0000)]
Merge "fix return value scale of notifyANR()"
Martijn Coenen [Tue, 14 Apr 2015 09:38:21 +0000 (11:38 +0200)]
Expose peer LLCP version in NDEF callbacks.
Change-Id: I98b9a9764b66345f842c1f845c8a386161d965f5
Martijn Coenen [Wed, 15 Apr 2015 08:00:10 +0000 (08:00 +0000)]
Merge "Add getPrefixAids()."
Martijn Coenen [Fri, 23 Jan 2015 19:29:54 +0000 (11:29 -0800)]
Add getPrefixAids().
Bug:
19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
Alex Klyubin [Wed, 15 Apr 2015 02:00:35 +0000 (19:00 -0700)]
Unbreak obtaining symmetric keys from AndroidKeyStore.
This tracks
59f977c6988e21b3b8aa6c83428bd6ee1a98816d due to which
AndroidKeyStore is unable to provide symmetric keys because it
assumes that the digest field is not repeating.
Bug:
18088752
Change-Id: Ie8ed01449280b7c759e81aeaf2066953b0abaf2a
baik.han [Wed, 15 Apr 2015 01:21:05 +0000 (10:21 +0900)]
fix return value scale of notifyANR()
fix return value scale of notifyANR()
from milliseconds to nanoseconds when windowState is not null
This prevent unintended frequent method calls of notifyANR()
in a very short time.
Change-Id: Icc1f363b3ed3538821a42c080809567473bfb833
Signed-off-by: Baik Han <baik.han@lge.com>
Hiroshi Yamauchi [Tue, 14 Apr 2015 23:49:02 +0000 (23:49 +0000)]
Merge "Fix javadoc error in Debug.getRuntimeStats()."
Dan Albert [Tue, 14 Apr 2015 23:25:26 +0000 (23:25 +0000)]
Merge "Fix UB in ResourceTable::stringToInt."
Hiroshi Yamauchi [Tue, 14 Apr 2015 23:07:26 +0000 (16:07 -0700)]
Fix javadoc error in Debug.getRuntimeStats().
Bug:
19825248
Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054
Tim Murray [Wed, 1 Apr 2015 18:07:16 +0000 (11:07 -0700)]
Add BNNM intrinsic.
Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404
Alex Klyubin [Tue, 14 Apr 2015 20:22:51 +0000 (20:22 +0000)]
Merge "No need to specify EC curve name in EcIesParameterSpec."
Alex Klyubin [Tue, 14 Apr 2015 19:59:02 +0000 (19:59 +0000)]
Merge "Make specifying self-signed cert parameters optional."
Alex Klyubin [Tue, 14 Apr 2015 19:48:17 +0000 (12:48 -0700)]
Make specifying self-signed cert parameters optional.
This removes the need to specify the three parameters of the
self-signed certificate (serial number, subject, validity range) when
generating key pairs in AndroidKeyStore. This is achieved by
providing sensible defaults for these parameters:
* serial number: 1
* subject: CN=fake
* validity range: Jan 1 1970 to Jan 1 2048.
Bug:
18088752
Change-Id: I5df918b1ef8b26ed3ddd43828c4c78c9fa58cd43
Hiroshi Yamauchi [Tue, 14 Apr 2015 19:08:30 +0000 (19:08 +0000)]
Merge "Add Debug.getRuntimeStat()."
Alex Klyubin [Tue, 14 Apr 2015 17:52:34 +0000 (10:52 -0700)]
Add Keymaster KM_ORIGIN_UNKNOWN constant.
This tracks
d359b044830b292f492f8a8df5471f869e358399 from
hardware/libhardware.
Bug:
18088752
Change-Id: I9a7bd8bdee51c18ae0427eff4efe036213d2b175
Hiroshi Yamauchi [Thu, 2 Apr 2015 19:26:10 +0000 (12:26 -0700)]
Add Debug.getRuntimeStat().
Export runtime stats (currently GC stats) through this method.
Bug:
19825248
Change-Id: I147a0e9bc6bdfe4dc29d74e44f0af6349c51d9f8
Yang Ni [Tue, 14 Apr 2015 16:15:54 +0000 (16:15 +0000)]
Merge "Add name to ScriptGroup2.Builder.create() method"
Erik Kline [Tue, 14 Apr 2015 07:58:32 +0000 (07:58 +0000)]
Merge "Add android.net.IpPrefix#contains()"
Erik Kline [Mon, 13 Apr 2015 06:33:34 +0000 (15:33 +0900)]
Add android.net.IpPrefix#contains()
This was originally to avoid RuntimeException in RouteInfo#matches():
When an IPv6 prefix with a length greater than the max permitted
for IPv4 is matched against an Inet4Address, the call to
NetworkUtils throws RuntimeException.
Change-Id: I92e2bd19a4e7d656cf682fd27678da07e211850d
Yang Ni [Fri, 3 Apr 2015 00:47:56 +0000 (17:47 -0700)]
Add name to ScriptGroup2.Builder.create() method
This name will be used to name the .so file generated for the
script group with fused kernels.
Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
Ruchi Kandoi [Tue, 14 Apr 2015 00:17:09 +0000 (00:17 +0000)]
Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds."
Yang Ni [Mon, 13 Apr 2015 22:52:30 +0000 (22:52 +0000)]
Merge "Add a name to ScriptGroup2.Builder.create method"
Yang Ni [Mon, 6 Apr 2015 23:58:57 +0000 (16:58 -0700)]
Add a name to ScriptGroup2.Builder.create method
The name is not used in any meaningful way yet, but would be used
to name the file for generated code for fused kernels in other
coming CLs.
A script group name cannot be null or empty, or longer than 100
characters. It can only contain letters, digits, '-', or '_'.
Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b
Alex Klyubin [Mon, 13 Apr 2015 17:20:24 +0000 (10:20 -0700)]
No need to specify EC curve name in EcIesParameterSpec.
EC curve parameters will be obtained from the provided EC key.
Bug:
18088752
Change-Id: Ic99353a6566c8d4ce2b6b73d0309edaa40f84fa6
Alex Klyubin [Mon, 13 Apr 2015 17:01:28 +0000 (17:01 +0000)]
Merge "Use JCA names for block modes, paddings, and digests."
Alex Klyubin [Fri, 10 Apr 2015 20:28:03 +0000 (13:28 -0700)]
Use JCA names for block modes, paddings, and digests.
This replaces int-based enums from KeyStoreKeyConstraints with
String values commonly used in JCA API.
As part of under the hood refactoring:
* KeyStoreKeyCharacteristics and KeyStoreKeyConstraints have been
merged into KeyStoreKeyProperties.
* KeymasterUtils methods operating on KeymasterArguments and
KeymasterCharacteristics have been moved to their respective
classes.
Bug:
18088752
Change-Id: I9c8b984cb3c28184adb617e34d87f2837bd1d3a1
Wale Ogunwale [Mon, 13 Apr 2015 04:25:27 +0000 (04:25 +0000)]
Merge "Clean-up state if we have an exception when acquiring provider"
riddle_hsu [Mon, 16 Feb 2015 10:43:49 +0000 (18:43 +0800)]
[ActivityManager] Fix activity always visible.
Sample code, symptom video and detail:
http://code.google.com/p/android/issues/detail?id=87909
If device is sleeping, activity will be paused immediately
after resume, it is unnecessary to force complete it.
Otherwise the state may get worse because mPausingActivity
is cleared, the real pausing from activityPausedLocked won't
be able to complete pause flow (PAUSING to PAUSED).
If the fail-to-pause activity called finish, it will also
cannot complete finish flow because only !PAUSING can do it.
This results in an activity that has visible=true, finishing=true,
state=PAUSING and always show on wallpaper.
Issue flow:
Case 1
1.At home stack and screen off.
2.A task T contains one activity Z and its process was died.
3.Launch new activity X on T.
4.Before activity Z complete resume, any process
bound and died trigger update visibility and resume top.
5.X calls finish.
6.Turn on screen, X will be always visible.
Case 2
1.Launch Settings (or any), press home key.
2.Launch an activity X in Task T, press home key.
3.Kill process of activity X, turn off screen.
4.Launch activity X with NEW_TASK | CLEAR_TASK.
5.Activity X calls finish.
6.Turn on screen, X will be always visible.
Change-Id: I8ca1845fd100e13ec58382c8c0105bf0a9f8137d
Alex Klyubin [Sat, 11 Apr 2015 02:17:00 +0000 (02:17 +0000)]
Merge "Add EcIesParameterSpec to enable ECIES crypto."
Alex Klyubin [Fri, 10 Apr 2015 17:20:48 +0000 (10:20 -0700)]
Add EcIesParameterSpec to enable ECIES crypto.
Bug:
18088752
Change-Id: I597b019106c500188e0fbbc9608722668c08b421