From add8de49e97c35fbf8fa365b6cc1673e37c58852 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Tue, 15 Jun 2021 12:52:45 -0700
Subject: [PATCH] Move testAlwaysRequireConsent to frameworks/base

Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I1c374b0e0e051a2e911d4586f7f2f9928c9de260
---
 .../biometrics/ParentalControlsUtils.java     | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/com/android/settings/biometrics/ParentalControlsUtils.java b/src/com/android/settings/biometrics/ParentalControlsUtils.java
index 35db6f4b9d0..2d3673b2de3 100644
--- a/src/com/android/settings/biometrics/ParentalControlsUtils.java
+++ b/src/com/android/settings/biometrics/ParentalControlsUtils.java
@@ -21,9 +21,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
 import android.hardware.biometrics.ParentalControlsUtilsInternal;
-import android.os.Build;
 import android.os.UserHandle;
-import android.provider.Settings;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -39,24 +37,19 @@ import com.android.settingslib.RestrictedLockUtils;
 public class ParentalControlsUtils {
 
     private static final String TAG = "ParentalControlsUtils";
-    private static final String TEST_ALWAYS_REQUIRE_CONSENT =
-            "com.android.settings.biometrics.ParentalControlsUtils.always_require_consent";
 
     /**
-     * Public version that enables test paths based on {@link #TEST_ALWAYS_REQUIRE_CONSENT}
+     * Public version that enables test paths, see
+     * {@link android.hardware.biometrics.ParentalControlsUtilsInternal#isTestModeEnabled(Context)}
      * @return non-null EnforcedAdmin if parental consent is required
      */
     public static RestrictedLockUtils.EnforcedAdmin parentConsentRequired(@NonNull Context context,
             @BiometricAuthenticator.Modality int modality) {
 
         final UserHandle userHandle = new UserHandle(UserHandle.myUserId());
-        if (Build.IS_USERDEBUG || Build.IS_ENG) {
-            final boolean testAlwaysRequireConsent = Settings.Secure.getInt(
-                    context.getContentResolver(), TEST_ALWAYS_REQUIRE_CONSENT, 0) != 0;
-            if (testAlwaysRequireConsent) {
-                Log.d(TAG, "Requiring consent for test flow");
-                return new RestrictedLockUtils.EnforcedAdmin(null /* ComponentName */, userHandle);
-            }
+        if (ParentalControlsUtilsInternal.isTestModeEnabled(context)) {
+            Log.d(TAG, "Requiring consent for test flow");
+            return new RestrictedLockUtils.EnforcedAdmin(null /* ComponentName */, userHandle);
         }
 
         final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
@@ -72,7 +65,8 @@ public class ParentalControlsUtils {
     static RestrictedLockUtils.EnforcedAdmin parentConsentRequiredInternal(
             @NonNull DevicePolicyManager dpm, @BiometricAuthenticator.Modality int modality,
             @NonNull UserHandle userHandle) {
-        if (ParentalControlsUtilsInternal.parentConsentRequired(dpm, modality, userHandle)) {
+        if (ParentalControlsUtilsInternal.parentConsentRequired(dpm, modality,
+                userHandle)) {
             final ComponentName cn =
                     ParentalControlsUtilsInternal.getSupervisionComponentName(dpm, userHandle);
             return new RestrictedLockUtils.EnforcedAdmin(cn, userHandle);