commit 4ceaf6b78f7af8b394e8bae04d10f6b8e9e2f521
author joshmccloskey <joshmccloskey@google.com> Wed Aug 21 11:26:08 2019 -0700
committer joshmccloskey <joshmccloskey@google.com> Fri Aug 23 17:46:27 2019 -0700
tree fe94627a8d2ce91a1c40722e08ac649831fd8f28
parent aaf6ce298da522f032b44ff3c963cfbfcc217cfb

Added flag to toggle acquire messages on keyguard

Test: adb shell settings put secure com.android.server.biometrics.face.skip_keyguard_acquire_ignore_list 0/1
returns the correct the ignore/empty list.
Fixes: 139439176

Change-Id: Ibfafb5e5240704058ac446731733bba91013bb8f

services/core/java/com/android/server/biometrics/face/FaceService.java

diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index ee49f58..b1c7c76 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -53,6 +53,7 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.util.Slog;
 
 import com.android.internal.R;
@@ -102,6 +103,9 @@
     private static final String NOTIFICATION_TAG = "FaceService";
     private static final int NOTIFICATION_ID = 1;
 
+    private static final String SKIP_KEYGUARD_ACQUIRE_IGNORE_LIST =
+            "com.android.server.biometrics.face.skip_keyguard_acquire_ignore_list";
+
     /**
      * Events for bugreports.
      */
@@ -1047,6 +1051,9 @@
     public FaceService(Context context) {
         super(context);
 
+        final boolean ignoreKeyguardBlacklist = Settings.Secure.getInt(context.getContentResolver(),
+                SKIP_KEYGUARD_ACQUIRE_IGNORE_LIST, 0) != 0;
+
         mUsageStats = new UsageStats(context);
 
         mNotificationManager = getContext().getSystemService(NotificationManager.class);
@@ -1055,10 +1062,11 @@
                 .getIntArray(R.array.config_face_acquire_biometricprompt_ignorelist);
         mBiometricPromptIgnoreListVendor = getContext().getResources()
                 .getIntArray(R.array.config_face_acquire_vendor_biometricprompt_ignorelist);
-        mKeyguardIgnoreList = getContext().getResources()
+        mKeyguardIgnoreList = ignoreKeyguardBlacklist ? new int[0] : getContext().getResources()
                 .getIntArray(R.array.config_face_acquire_keyguard_ignorelist);
-        mKeyguardIgnoreListVendor = getContext().getResources()
-                .getIntArray(R.array.config_face_acquire_vendor_keyguard_ignorelist);
+        mKeyguardIgnoreListVendor =
+                ignoreKeyguardBlacklist ? new int[0] : getContext().getResources()
+                        .getIntArray(R.array.config_face_acquire_vendor_keyguard_ignorelist);
         mEnrollIgnoreList = getContext().getResources()
                 .getIntArray(R.array.config_face_acquire_enroll_ignorelist);
         mEnrollIgnoreListVendor = getContext().getResources()