diff options
| author | Paul Crowley <paulcrowley@google.com> | 2021-04-28 20:26:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 20:26:08 +0000 |
| commit | 0809d53d0700bc9e0de0a06d96fc6ca578843698 (patch) | |
| tree | fc1d42cd7c9bb66f56fe2e78d88942e2889a61c6 /keystore/java/android/security/Authorization.java | |
| parent | 3be17c6711978dda8bb0d0c5964b280fc8779165 (diff) | |
| parent | 9c975f233596e154bdf6696398efb0ebc65b4746 (diff) | |
Merge changes from topic "biometric-unlocked-required" am: c36995ec84 am: cf5f4d6cbf am: 9c975f2335
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106
Change-Id: I2c7e8050ca82f81ca865a76bd11a39d82eb09dcc
Diffstat (limited to 'keystore/java/android/security/Authorization.java')
| -rw-r--r-- | keystore/java/android/security/Authorization.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/keystore/java/android/security/Authorization.java b/keystore/java/android/security/Authorization.java index bd72d45297c1..00219e7f28ac 100644 --- a/keystore/java/android/security/Authorization.java +++ b/keystore/java/android/security/Authorization.java @@ -74,16 +74,19 @@ public class Authorization { * @param locked - whether it is a lock (true) or unlock (false) event * @param syntheticPassword - if it is an unlock event with the password, pass the synthetic * password provided by the LockSettingService + * @param unlockingSids - KeyMint secure user IDs that should be permitted to unlock + * UNLOCKED_DEVICE_REQUIRED keys. * * @return 0 if successful or a {@code ResponseCode}. */ public static int onLockScreenEvent(@NonNull boolean locked, @NonNull int userId, - @Nullable byte[] syntheticPassword) { + @Nullable byte[] syntheticPassword, @Nullable long[] unlockingSids) { try { if (locked) { - getService().onLockScreenEvent(LockScreenEvent.LOCK, userId, null); + getService().onLockScreenEvent(LockScreenEvent.LOCK, userId, null, unlockingSids); } else { - getService().onLockScreenEvent(LockScreenEvent.UNLOCK, userId, syntheticPassword); + getService().onLockScreenEvent( + LockScreenEvent.UNLOCK, userId, syntheticPassword, unlockingSids); } return 0; } catch (RemoteException | NullPointerException e) { |