OSDN Git Service
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"
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
Chad Brubaker [Fri, 10 Apr 2015 21:42:23 +0000 (21:42 +0000)]
Merge "Fix testSaw_ungrantedUid_Bluetooth"
Shawn Willden [Fri, 10 Apr 2015 21:21:36 +0000 (21:21 +0000)]
Merge "Make several key crypto parameters repeatable"
Chad Brubaker [Fri, 10 Apr 2015 21:15:01 +0000 (14:15 -0700)]
Fix testSaw_ungrantedUid_Bluetooth
Keystore.saw returns [] on no result, not null, so the test was
incorrectly failing.
Change-Id: I22dcf85c5d6c5c0368848bc784c3215c092d9ea8
Olawale Ogunwale [Fri, 10 Apr 2015 20:14:52 +0000 (20:14 +0000)]
Merge "Check caller status precisely when registering receiver."
Chad Brubaker [Thu, 5 Mar 2015 22:46:16 +0000 (14:46 -0800)]
Make several key crypto parameters repeatable
Bug:
19509156
Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
Alex Klyubin [Fri, 10 Apr 2015 17:51:44 +0000 (17:51 +0000)]
Merge "Track more changes to keymaster_defs.h"
Wale Ogunwale [Thu, 9 Apr 2015 22:42:12 +0000 (15:42 -0700)]
Clean-up state if we have an exception when acquiring provider
We can get a number of exceptions (e.g. SecurityException) when
a process is acquiring a provider. We need to clean-up correctly
so that other threads that try to acquire the provider the progress.
Bug:
20122809
Change-Id: Icac1d391df7e8c24198be89035b1c5a23da834cf
Nick Kralevich [Fri, 10 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Impose an ordering on created SELinuxMMAC Policy objects."
Alex Klyubin [Fri, 10 Apr 2015 02:59:00 +0000 (19:59 -0700)]
Track more changes to keymaster_defs.h
KeyStoreTest needed to be adjusted because OCB is no longer supported.
Bug:
18088752
Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
riddle_hsu [Wed, 4 Feb 2015 12:52:03 +0000 (20:52 +0800)]
Check caller status precisely when registering receiver.
Fine tune commit
9ac9609f.
Because process may reuse same process record to restart.
It is better to check below conditions to skip:
1. Simple dead and has been cleaned.
=> .thread will be null
2.The process has restarted with new pid but has not attached yet.
=> .thread will be null
3.The process has restarted and attached.
=> The IBinder will be different
Change-Id: Ic052f5025558ca93e1a6ab11bca61fe995126bb9
John Reck [Fri, 10 Apr 2015 15:32:00 +0000 (15:32 +0000)]
Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
John Reck [Fri, 10 Apr 2015 15:27:01 +0000 (15:27 +0000)]
Merge "Fixing memory leak in RenderBufferCache"
Robert Craig [Fri, 10 Apr 2015 15:02:33 +0000 (11:02 -0400)]
Impose an ordering on created SELinuxMMAC Policy objects.
Imposing an order on Policy objects allows us to extend the
policy writers ability to union mac_permissions.xml files.
Policy developers can now create new mac_permissions.xml
entries under their device specific directories. This is
in contrast to current methods which only allow differing
stanzas to appear outside the base mac_permissions.xml.
Also, report on stanzas with duplicate input selectors and
treat these as errors. There are some ambiguities that can
arise otherwise.
Lastly, impose an XOR condition on signer stanzas w.r.t seinfo
and package tags. This finer distinction helps the union feature
of policy to become clearer and simpler to code.
Change-Id: Idd86df8ad9a63d1b8ba6e8270670814ca6cee8d2
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Tim Murray [Fri, 10 Apr 2015 00:51:14 +0000 (00:51 +0000)]
Merge "Add support for setting the cache directory."
Tim Murray [Tue, 7 Apr 2015 22:43:24 +0000 (15:43 -0700)]
Add support for setting the cache directory.
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
Alex Klyubin [Fri, 10 Apr 2015 00:01:18 +0000 (00:01 +0000)]
Merge "Track recent keymaster_defs.h changes."
Alex Klyubin [Thu, 9 Apr 2015 23:58:58 +0000 (16:58 -0700)]
Track recent keymaster_defs.h changes.
Bug:
18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
Alex Klyubin [Thu, 9 Apr 2015 23:34:44 +0000 (23:34 +0000)]
Merge "Split key origin into TEE/not and generated/imported."
Mathieu Chartier [Thu, 9 Apr 2015 23:14:27 +0000 (23:14 +0000)]
Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
Mathieu Chartier [Thu, 9 Apr 2015 21:32:31 +0000 (14:32 -0700)]
Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Example output of "adb shell dumpsys meminfo -d":
Total PSS by category:
193605 kB: Dalvik
87561 kB: .Heap
77863 kB: .LOS
15333 kB: .Zygote
12848 kB: .NonMoving
6770 kB: .GC
2597 kB: .LinearAlloc
1180 kB: .JITCache
1180 kB: .IndirectRef
103936 kB: EGL mtrack
101827 kB: Native
Bug:
17643507
(cherry picked from commit
546edc5a31bb5a843048e11d8afb0b1f6441ddb4)
Change-Id: If34627cf93ba5305b428d2278f350a2649d63d5e
Alex Klyubin [Thu, 9 Apr 2015 22:50:17 +0000 (15:50 -0700)]
Split key origin into TEE/not and generated/imported.
This is to match the upcoming changes in Keymaster HAL API.
Bug:
18088752
Change-Id: I602d56d1c29a839583be1d9efa681a6fab6642db
Jeff Sharkey [Thu, 9 Apr 2015 21:41:11 +0000 (21:41 +0000)]
Merge "Start passing volume UUID to installd."
Alex Klyubin [Thu, 9 Apr 2015 21:40:58 +0000 (21:40 +0000)]
Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
Alex Klyubin [Thu, 9 Apr 2015 21:33:11 +0000 (14:33 -0700)]
Fix minor issues in new Javadocs of AndroidKeyStore.
Bug:
18088752
Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d
Jeff Sharkey [Thu, 9 Apr 2015 20:18:44 +0000 (13:18 -0700)]
Start passing volume UUID to installd.
This change adds new method overloads to provide volume UUID. The
older methods remain for now, and pass through the "null" UUID to
reference internal storage.
Follows the existing pattern where null arguments are passed as "!".
Bug:
19993667
Change-Id: Ia1b7c8550cabc13e4f6e1182eabb650f2c33e44f
Alex Klyubin [Thu, 9 Apr 2015 20:02:39 +0000 (20:02 +0000)]
Merge "Add asymmetric crypto constants for AndroidKeyStore API."
Alex Klyubin [Thu, 9 Apr 2015 19:57:12 +0000 (19:57 +0000)]
Merge "Add missing mapping between JCA and keystore HMAC names."
Alex Klyubin [Thu, 9 Apr 2015 18:38:44 +0000 (11:38 -0700)]
Add asymmetric crypto constants for AndroidKeyStore API.
Bug:
18088752
Change-Id: Iee72a4c230f3a2cd30d9eb4d29c4301f3e113f31
Dan Albert [Thu, 9 Apr 2015 18:09:09 +0000 (18:09 +0000)]
Merge "Ensure alignment of Res_png_9patch."
Dan Albert [Wed, 8 Apr 2015 01:38:42 +0000 (18:38 -0700)]
Ensure alignment of Res_png_9patch.
This doesn't alter the alignment of the data within the struct, but
enforces that this structure will be appropriately aligned when used.
The image_info struct has this struct preceded by a bool, which causes
odd alignment for the members of this struct.
Change-Id: Ia2ef5c81b2f961c0f61858a10a7821d82f600919
Alex Klyubin [Thu, 9 Apr 2015 16:28:38 +0000 (09:28 -0700)]
Add missing mapping between JCA and keystore HMAC names.
This is a follow-up to
70376a77280551791dae62586a6bb0c77ed9429a where
I forgot to update this mapping.
Bug:
18088752
Change-Id: I322a9abd642ddee3bd2b4f49379b121012e32836
Alex Klyubin [Thu, 9 Apr 2015 16:51:02 +0000 (16:51 +0000)]
Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."
Alex Klyubin [Thu, 9 Apr 2015 16:42:09 +0000 (09:42 -0700)]
Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
This wasn't meant to be public API yet.
Bug:
18088752
Change-Id: I40e57fd9121348086ae88ad9fa54f930547b77ba
Alex Klyubin [Thu, 9 Apr 2015 16:12:08 +0000 (16:12 +0000)]
Merge "Require IND-CPA by default for new AndroidKeyStore keys."
Richard Uhler [Thu, 9 Apr 2015 14:13:26 +0000 (14:13 +0000)]
Merge "Reuse dexopt method for both dex2oat and patchoat."
Colin Cross [Thu, 9 Apr 2015 00:49:55 +0000 (00:49 +0000)]
Merge "Re-enable -Wall and -Werror that were lost in a merge"