From 32f840b54437c15c8d3a8f06f0f792f06baaf348 Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Fri, 6 Nov 2020 14:28:40 -0800
Subject: [PATCH] Make LockoutCache accessible to both fingerprint and face

Bug: 171335732
Test: build
Change-Id: I7fcbf13a3879ab11a3399cf52f54740a592a6032
---
 .../sensors/{fingerprint/aidl => }/LockoutCache.java      | 8 +++-----
 .../fingerprint/aidl/FingerprintAuthenticationClient.java | 1 +
 .../fingerprint/aidl/FingerprintResetLockoutClient.java   | 1 +
 .../biometrics/sensors/fingerprint/aidl/Sensor.java       | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename services/core/java/com/android/server/biometrics/sensors/{fingerprint/aidl => }/LockoutCache.java (86%)

diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/LockoutCache.java b/services/core/java/com/android/server/biometrics/sensors/LockoutCache.java
similarity index 86%
rename from services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/LockoutCache.java
rename to services/core/java/com/android/server/biometrics/sensors/LockoutCache.java
index 2fae1f3d9d43f..0aba29557b20b 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/LockoutCache.java
+++ b/services/core/java/com/android/server/biometrics/sensors/LockoutCache.java
@@ -14,21 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.server.biometrics.sensors.fingerprint.aidl;
+package com.android.server.biometrics.sensors;
 
 import android.util.SparseIntArray;
 
-import com.android.server.biometrics.sensors.LockoutTracker;
-
 /**
  * For a single sensor, caches lockout states for all users.
  */
-class LockoutCache implements LockoutTracker {
+public class LockoutCache implements LockoutTracker {
 
     // Map of userId to LockoutMode
     private final SparseIntArray mUserLockoutStates;
 
-    LockoutCache() {
+    public LockoutCache() {
         mUserLockoutStates = new SparseIntArray();
     }
 
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
index 8acf4f5204a96..ce0c43937af1a 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
@@ -32,6 +32,7 @@ import android.util.Slog;
 
 import com.android.server.biometrics.sensors.AuthenticationClient;
 import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.LockoutCache;
 import com.android.server.biometrics.sensors.LockoutConsumer;
 import com.android.server.biometrics.sensors.LockoutTracker;
 import com.android.server.biometrics.sensors.fingerprint.Udfps;
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java
index 17181264c6203..1f1d19d07121f 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java
@@ -27,6 +27,7 @@ import android.util.Slog;
 
 import com.android.server.biometrics.HardwareAuthTokenUtils;
 import com.android.server.biometrics.sensors.ClientMonitor;
+import com.android.server.biometrics.sensors.LockoutCache;
 import com.android.server.biometrics.sensors.LockoutResetDispatcher;
 import com.android.server.biometrics.sensors.LockoutTracker;
 
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java
index 51c30b68e0c5e..2e78912703f2c 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java
@@ -49,6 +49,7 @@ import com.android.server.biometrics.sensors.BiometricScheduler;
 import com.android.server.biometrics.sensors.ClientMonitor;
 import com.android.server.biometrics.sensors.EnumerateConsumer;
 import com.android.server.biometrics.sensors.Interruptable;
+import com.android.server.biometrics.sensors.LockoutCache;
 import com.android.server.biometrics.sensors.LockoutConsumer;
 import com.android.server.biometrics.sensors.RemovalConsumer;
 import com.android.server.biometrics.sensors.fingerprint.FingerprintUtils;