frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev	Chad Brubaker	2015-04-29	1	-0/+8
\|\
\| *	Add OP_AUTH_NEEDED KeyStore result code	Chad Brubaker	2015-04-28	1	-0/+8
* \|	Align AndroidKeyStore API with user auth API.	Alex Klyubin	2015-04-28	9	-362/+216
\|/
*	am 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to usin...	Kenny Root	2015-04-24	4	-34/+34
\|\
\| *	Merge "frameworks/base: switch to using NativeConstants."	Kenny Root	2015-04-24	4	-34/+34
\| \|\
\| \| *	frameworks/base: switch to using NativeConstants.	Adam Langley	2015-04-24	4	-34/+34
* \| \|	resolved conflicts for merge of f9c14b7d to master	Alex Klyubin	2015-04-24	11	-94/+105
\|\ \ \ \| \|/ /
\| * \|	No runtime exceptions during normal use of AndroidKeyStore crypto.	Alex Klyubin	2015-04-24	10	-95/+102
* \| \|	am edf5454a: am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and C...	Alex Klyubin	2015-04-24	2	-22/+79
\|\ \ \ \| \|/ /
\| * \|	Reset AndroidKeyStore Mac and Cipher state when init fails.	Alex Klyubin	2015-04-24	2	-22/+79
\| \|/
* \|	Merge "Set Secure User ID from app level."	Alex Klyubin	2015-04-16	3	-0/+42
\|\ \
\| * \|	Set Secure User ID from app level.	Alex Klyubin	2015-04-16	3	-0/+42
* \| \|	Unhide KeyStoreKeyProperties.Origin.UNKNOWN.	Alex Klyubin	2015-04-16	1	-3/+1
\|/ /
* \|	am b1aa7d0b: am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN...	Alex Klyubin	2015-04-16	1	-1/+11
\|\ \ \| \|/
\| *	Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."	Alex Klyubin	2015-04-16	1	-1/+11
\| \|\
\| \| *	Add Keymaster KM_ORIGIN_UNKNOWN constant.	Alex Klyubin	2015-04-14	1	-1/+11
* \| \|	am 22b5d9b9: am 28a9089f: am 216d18b9: Merge "Remove IV auto-generation worka...	Alex Klyubin	2015-04-16	1	-12/+6
\|\ \ \ \| \|/ /
\| * \|	Remove IV auto-generation workaround.	Alex Klyubin	2015-04-15	1	-12/+6
* \| \|	am 763100e6: am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric key...	Shawn Willden	2015-04-15	1	-5/+10
\|\ \ \ \| \|/ /
\| * \|	Unbreak obtaining symmetric keys from AndroidKeyStore.	Alex Klyubin	2015-04-14	1	-5/+10
* \| \|	resolved conflicts for merge of 1d5a2592 to master	Alex Klyubin	2015-04-14	1	-29/+2
\|\ \ \ \| \|/ /
\| * \|	Merge "No need to specify EC curve name in EcIesParameterSpec."	Alex Klyubin	2015-04-14	1	-25/+2
\| \|\ \
\| \| * \|	No need to specify EC curve name in EcIesParameterSpec.	Alex Klyubin	2015-04-13	1	-25/+2
\| \| \|/
* \| \|	am fa2bd4fe: am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cer...	Alex Klyubin	2015-04-14	2	-40/+64
\|\ \ \ \| \|/ /
\| * \|	Make specifying self-signed cert parameters optional.	Alex Klyubin	2015-04-14	2	-40/+64
\| \|/
* \|	Unhide the new AndroidKeyStore API.	Alex Klyubin	2015-04-13	12	-129/+10
* \|	resolved conflicts for merge of a978a3d6 to master	Alex Klyubin	2015-04-13	15	-1456/+1099
\|\ \ \| \|/
\| *	Merge "Use JCA names for block modes, paddings, and digests."	Alex Klyubin	2015-04-13	15	-1446/+1089
\| \|\
\| \| *	Use JCA names for block modes, paddings, and digests.	Alex Klyubin	2015-04-13	15	-1446/+1089
* \| \|	am 651dbfde: am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enabl...	Alex Klyubin	2015-04-11	1	-0/+287
\|\ \ \ \| \|/ /
\| * \|	Merge "Add EcIesParameterSpec to enable ECIES crypto."	Alex Klyubin	2015-04-11	1	-0/+287
\| \|\ \
\| \| * \|	Add EcIesParameterSpec to enable ECIES crypto.	Alex Klyubin	2015-04-10	1	-0/+287
* \| \| \|	am 93976df8: am 3a9779b6: am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Blueto...	Chad Brubaker	2015-04-10	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Fix testSaw_ungrantedUid_Bluetooth"	Chad Brubaker	2015-04-10	1	-2/+2
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Fix testSaw_ungrantedUid_Bluetooth	Chad Brubaker	2015-04-10	1	-2/+2
\| \| \|/
* \| \|	am d31d4771: am c5f9683c: am a270264c: Merge "Track more changes to keymaster...	Alex Klyubin	2015-04-10	1	-9/+5
\|\ \ \ \| \|/ /
\| * \|	Track more changes to keymaster_defs.h	Alex Klyubin	2015-04-10	1	-9/+5
\| \|/
* \|	am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h c...	Alex Klyubin	2015-04-10	1	-2/+2
\|\ \ \| \|/
\| *	Track recent keymaster_defs.h changes.	Alex Klyubin	2015-04-09	1	-2/+2
* \|	am 04a99c7b: am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not a...	Alex Klyubin	2015-04-10	3	-15/+29
\|\ \ \| \|/
\| *	Split key origin into TEE/not and generated/imported.	Alex Klyubin	2015-04-09	3	-15/+29
* \|	am 4acc3392: am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadoc...	Alex Klyubin	2015-04-09	3	-21/+14
\|\ \ \| \|/
\| *	Fix minor issues in new Javadocs of AndroidKeyStore.	Alex Klyubin	2015-04-09	3	-21/+14
* \|	am 098833c5: am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants...	Alex Klyubin	2015-04-09	1	-5/+98
\|\ \ \| \|/
\| *	Merge "Add asymmetric crypto constants for AndroidKeyStore API."	Alex Klyubin	2015-04-09	1	-5/+98
\| \|\
\| \| *	Add asymmetric crypto constants for AndroidKeyStore API.	Alex Klyubin	2015-04-09	1	-5/+98
* \| \|	am c6112eb7: am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA...	Alex Klyubin	2015-04-09	2	-0/+11
\|\ \ \ \| \|/ /
\| * \|	Merge "Add missing mapping between JCA and keystore HMAC names."	Alex Klyubin	2015-04-09	2	-0/+11
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Add missing mapping between JCA and keystore HMAC names.	Alex Klyubin	2015-04-09	2	-0/+11
* \| \|	am bbf3cc57: am fd168151: am e26347bb: Merge "Hide KeyStoreParameter.Builder....	Alex Klyubin	2015-04-09	1	-1/+2
\|\ \ \ \| \|/ /