Merge "Retry fingerprint or face unlock" into tm-qpr-dev am: c1d0d230d4
am: 96f959737c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188600 Change-Id: I9c05b7bf43304fead4ae03a23a5106afe55612f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -22,6 +22,7 @@ import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.hardware.face.FaceManager;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
@@ -39,6 +40,7 @@ import java.util.Map;
|
||||
public class ShadowUtils {
|
||||
|
||||
private static FingerprintManager sFingerprintManager = null;
|
||||
private static FaceManager sFaceManager = null;
|
||||
private static boolean sIsUserAMonkey;
|
||||
private static boolean sIsDemoUser;
|
||||
private static ComponentName sDeviceOwnerComponentName;
|
||||
@@ -63,6 +65,15 @@ public class ShadowUtils {
|
||||
sFingerprintManager = fingerprintManager;
|
||||
}
|
||||
|
||||
@Implementation
|
||||
protected static FaceManager getFaceManagerOrNull(Context context) {
|
||||
return sFaceManager;
|
||||
}
|
||||
|
||||
public static void setFaceManager(FaceManager faceManager) {
|
||||
sFaceManager = faceManager;
|
||||
}
|
||||
|
||||
public static void reset() {
|
||||
sFingerprintManager = null;
|
||||
sIsUserAMonkey = false;
|
||||
|
Reference in New Issue
Block a user