commit d837cedb92bb484ed224c4a6bb1fe2b588a161fd
author Kevin Chyn <kchyn@google.com> Wed Sep 11 16:09:43 2019 -0700
committer Kevin Chyn <kchyn@google.com> Mon Sep 16 12:11:52 2019 -0700
tree a3e2a9789801234478894536063fb1675cc5663e
parent ddd0433c7d14092cf48c1d87882f2e2d2c2e455b

10/n: Remove old biometric UI

Test: atest com.android.systemui.biometrics
Bug: 123378871
Change-Id: Ic000148f4e4540d143581ca6cc296dba34a3db08

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
index 7c6792c..d10a3fe 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
@@ -29,7 +29,6 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.RemoteException;
-import android.provider.Settings;
 import android.util.Log;
 import android.view.WindowManager;
 
@@ -46,8 +45,6 @@
  */
 public class AuthController extends SystemUI implements CommandQueue.Callbacks,
         AuthDialogCallback {
-    private static final String DISABLE_NEW_DIALOG =
-            "com.android.systemui.biometrics.AuthController.DISABLE_NEW_DIALOG";
 
     private static final String TAG = "BiometricPrompt/AuthController";
     private static final boolean DEBUG = true;
@@ -316,25 +313,13 @@
 
     protected AuthDialog buildDialog(Bundle biometricPromptBundle, boolean requireConfirmation,
             int userId, int type, String opPackageName, boolean skipIntro) {
-        if (Settings.Secure.getIntForUser(
-                mContext.getContentResolver(), DISABLE_NEW_DIALOG, userId, 0) == 0) {
-            return new AuthContainerView.Builder(mContext)
-                    .setCallback(this)
-                    .setBiometricPromptBundle(biometricPromptBundle)
-                    .setRequireConfirmation(requireConfirmation)
-                    .setUserId(userId)
-                    .setOpPackageName(opPackageName)
-                    .setSkipIntro(skipIntro)
-                    .build(type);
-        } else {
-            return new BiometricDialogView.Builder(mContext)
-                    .setCallback(this)
-                    .setBiometricPromptBundle(biometricPromptBundle)
-                    .setRequireConfirmation(requireConfirmation)
-                    .setUserId(userId)
-                    .setOpPackageName(opPackageName)
-                    .setSkipIntro(skipIntro)
-                    .build(type);
-        }
+        return new AuthContainerView.Builder(mContext)
+                .setCallback(this)
+                .setBiometricPromptBundle(biometricPromptBundle)
+                .setRequireConfirmation(requireConfirmation)
+                .setUserId(userId)
+                .setOpPackageName(opPackageName)
+                .setSkipIntro(skipIntro)
+                .build(type);
     }
 }