040524f935858689b9f1e31416484041cb74ad2f - platform/frameworks/base

commit	040524f935858689b9f1e31416484041cb74ad2f	[log] [tgz]
author	Brian Young <bcyoung@google.com>	Mon Jan 29 23:56:59 2018 +0000
committer	android-build-team Robot <android-build-team-robot@google.com>	Tue Jan 30 21:10:11 2018 +0000
tree	f2adf8a8d04dfa58fa070d48ce1a7744a17938aa
parent	bf1e27d0588970477399f5ca47edeafee89f5b17 [diff]

Revert "Add "Unlocked device required" parameter to keys"

This reverts commit 55fff3a89d96d0d0f8b8cb161bb0dda170c21ccb.

Reason for revert: Build breakages on elfin, gce_x86_phone.

Bug: 67752510

Bug: 72679761
Change-Id: Ia495e9cb158b64fcf015e37b170554a7ed6810a7
(cherry picked from commit 3a28570b285d9248206fc0ab8b30e3b2a51ae5b3)

api/current.txt[diff]
core/java/android/security/IKeystoreService.aidl[diff]
core/java/android/security/keymaster/KeymasterDefs.java[diff]
keystore/java/android/security/KeyStore.java[diff]
keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java[diff]
keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java[diff]
keystore/java/android/security/keystore/AndroidKeyStoreSpi.java[diff]
keystore/java/android/security/keystore/KeyGenParameterSpec.java[diff]
keystore/java/android/security/keystore/KeyProtection.java[diff]
keystore/java/android/security/keystore/KeymasterUtils.java[diff]
keystore/java/android/security/keystore/UserAuthArgs.java[Deleted - diff]
services/core/java/com/android/server/fingerprint/FingerprintService.java[diff]
services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java[diff]

13 files changed

tree: f2adf8a8d04dfa58fa070d48ce1a7744a17938aa