diff options
| author | Bill Yi <byi@google.com> | 2020-05-04 20:37:46 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2020-05-05 20:34:22 +0000 |
| commit | b61408add5839a01f40809fc05608af244c0e47d (patch) | |
| tree | fee91bccbd8c90c79f5a7796f8fa48620cad273f /keystore/java/android/security/KeyStore.java | |
| parent | 92bb1f4d21609b0ca13fa857e5b6c94023fd99fe (diff) | |
| parent | 62b1d634b63e3c4f346da9b092ea62ab885bd138 (diff) | |
Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE
Change-Id: I7ce0992bd12158655c0f4833fd924c8012386996
Merged-In: I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b
Merged-In: Icd731877c220b0e3b39258812030313cbaba90c0
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index e9bc8026d25e..d35642e362b1 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -1067,6 +1067,17 @@ public class KeyStore { return onUserPasswordChanged(UserHandle.getUserId(Process.myUid()), newPassword); } + /** + * Notify keystore about the latest user locked state. This is to support keyguard-bound key. + */ + public void onUserLockedStateChanged(int userHandle, boolean locked) { + try { + mBinder.onKeyguardVisibilityChanged(locked, userHandle); + } catch (RemoteException e) { + Log.w(TAG, "Failed to update user locked state " + userHandle, e); + } + } + private class KeyAttestationCallbackResult { private KeystoreResponse keystoreResponse; private KeymasterCertificateChain certificateChain; |