summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Document hprof-conv -zBrian Carlstrom2015-04-161-1/+5
| | | | | Bug: 18473132 Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
* Merge "Add IV-related Keymaster error codes."Alex Klyubin2015-04-161-0/+4
|\
| * Add IV-related Keymaster error codes.Alex Klyubin2015-04-151-0/+4
| | | | | | | | | | Bug: 18088752 Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
* | Merge "Remove IV auto-generation workaround."Alex Klyubin2015-04-161-12/+6
|\ \
| * | Remove IV auto-generation workaround.Alex Klyubin2015-04-151-12/+6
| |/ | | | | | | | | | | | | | | | | | | 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
* | Merge "[RenderScript] typo fix in Allocation.java"Miao Wang2015-04-161-1/+1
|\ \ | |/ |/|
| * [RenderScript] typo fix in Allocation.javaMiao Wang2015-04-151-1/+1
| | | | | | | | Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
* | Merge "Add BNNM intrinsic."Tim Murray2015-04-153-0/+60
|\ \ | |/ |/|
| * Add BNNM intrinsic.Tim Murray2015-04-143-0/+60
| | | | | | | | Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404
* | Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."Shawn Willden2015-04-151-5/+10
|\ \
| * | Unbreak obtaining symmetric keys from AndroidKeyStore.Alex Klyubin2015-04-141-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "fix return value scale of notifyANR()"Michael Wright2015-04-151-1/+1
|\ \ \
| * | | fix return value scale of notifyANR()baik.han2015-04-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
|\ \ \ | |/ / |/| |
| * | Add getPrefixAids().Martijn Coenen2015-04-151-1/+14
| | | | | | | | | | | | | | | Bug: 19144664 Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
* | | Merge "Fix javadoc error in Debug.getRuntimeStats()."Hiroshi Yamauchi2015-04-141-1/+1
|\ \ \
| * | | Fix javadoc error in Debug.getRuntimeStats().Hiroshi Yamauchi2015-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19825248 Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054
* | | | Merge "Fix UB in ResourceTable::stringToInt."Dan Albert2015-04-144-35/+155
|\ \ \ \ | |/ / / |/| | |
| * | | Fix UB in ResourceTable::stringToInt.Dan Albert2015-04-084-35/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was here because UBsan found integer overflow in the parsing for hex numbers, since hex numbers here are actually unsigned but assigned to a signed integer. Also fixes a number of missing error conditions. Change-Id: Iaea576daedfc6c75521cde02de3fe9dd0198a3b7
* | | | Merge "No need to specify EC curve name in EcIesParameterSpec."Alex Klyubin2015-04-141-25/+2
|\ \ \ \
| * | | | No need to specify EC curve name in EcIesParameterSpec.Alex Klyubin2015-04-131-25/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | EC curve parameters will be obtained from the provided EC key. Bug: 18088752 Change-Id: Ic99353a6566c8d4ce2b6b73d0309edaa40f84fa6
* | | | Merge "Make specifying self-signed cert parameters optional."Alex Klyubin2015-04-142-40/+64
|\ \ \ \
| * | | | Make specifying self-signed cert parameters optional.Alex Klyubin2015-04-142-40/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add Debug.getRuntimeStat().Hiroshi Yamauchi2015-04-141-0/+90
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Export runtime stats (currently GC stats) through this method. Bug: 19825248 Change-Id: I147a0e9bc6bdfe4dc29d74e44f0af6349c51d9f8
* | | | Merge "Add name to ScriptGroup2.Builder.create() method"Yang Ni2015-04-143-9/+15
|\ \ \ \
| * | | | Add name to ScriptGroup2.Builder.create() methodYang Ni2015-04-133-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This name will be used to name the .so file generated for the script group with fused kernels. Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
* | | | | Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-146-7/+51
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add android.net.IpPrefix#contains()Erik Kline2015-04-146-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "BatteryStats: Adds an additional condition to avoid ↵Ruchi Kandoi2015-04-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ArrayIndexOutOfBounds."
| * | | | | BatteryStats: Adds an additional condition to avoidRuchi Kandoi2014-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ArrayIndexOutOfBounds. This change takes care of the case when the length of the array is 0. Bug: 16039301 Change-Id: Ideb3ccc723c5d720069760aeedae8abb91c6420d
* | | | | | Merge "Add a name to ScriptGroup2.Builder.create method"Yang Ni2015-04-131-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add a name to ScriptGroup2.Builder.create methodYang Ni2015-04-131-1/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-1317-1446/+1151
|\ \ \ \ \
| * | | | | Use JCA names for block modes, paddings, and digests.Alex Klyubin2015-04-1317-1446/+1151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Clean-up state if we have an exception when acquiring provider"Wale Ogunwale2015-04-131-24/+42
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Clean-up state if we have an exception when acquiring providerWale Ogunwale2015-04-101-24/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Add EcIesParameterSpec to enable ECIES crypto."Alex Klyubin2015-04-111-0/+287
|\ \ \ \ \ \
| * | | | | | Add EcIesParameterSpec to enable ECIES crypto.Alex Klyubin2015-04-101-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: I597b019106c500188e0fbbc9608722668c08b421
* | | | | | | Merge "Fix testSaw_ungrantedUid_Bluetooth"Chad Brubaker2015-04-101-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix testSaw_ungrantedUid_BluetoothChad Brubaker2015-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keystore.saw returns [] on no result, not null, so the test was incorrectly failing. Change-Id: I22dcf85c5d6c5c0368848bc784c3215c092d9ea8
* | | | | | | | Merge "Make several key crypto parameters repeatable"Shawn Willden2015-04-101-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Make several key crypto parameters repeatableChad Brubaker2015-04-101-6/+6
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19509156 Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
* | | | | | | | Merge "Check caller status precisely when registering receiver."Olawale Ogunwale2015-04-101-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Check caller status precisely when registering receiver.riddle_hsu2015-04-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Track more changes to keymaster_defs.h"Alex Klyubin2015-04-102-27/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Track more changes to keymaster_defs.hAlex Klyubin2015-04-102-27/+6
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyStoreTest needed to be adjusted because OCB is no longer supported. Bug: 18088752 Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
* | | | | | | Merge "Impose an ordering on created SELinuxMMAC Policy objects."Nick Kralevich2015-04-101-53/+164
|\ \ \ \ \ \ \
| * | | | | | | Impose an ordering on created SELinuxMMAC Policy objects.Robert Craig2015-04-101-53/+164
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."John Reck2015-04-101-0/+2
|\ \ \ \ \ \ \
generated by cgit v1.1 at 2025-11-26 22:54:56 +0000