From 61d998406d396c789011817449a93ddbb1fb497d Mon Sep 17 00:00:00 2001
From: Joe Bolinger <jbolinger@google.com>
Date: Mon, 26 Jul 2021 17:34:43 -0700
Subject: [PATCH] Use RestrictedPreference for all biometric settings.

Fix hardcoded preference key in settings controller.

Fix: 194708564
Bug: 194246380
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I86bdd40fd848c5ba2d39acfde4771f5969e640d1
---
 res/xml/security_dashboard_settings.xml                     | 6 +++---
 res/xml/security_settings_combined_biometric.xml            | 4 ++--
 res/xml/security_settings_combined_biometric_profile.xml    | 4 ++--
 .../CombinedBiometricStatusPreferenceController.java        | 2 +-
 .../biometrics/face/FaceStatusPreferenceController.java     | 2 +-
 .../fingerprint/FingerprintStatusPreferenceController.java  | 2 +-
 .../CombinedBiometricStatusPreferenceControllerTest.java    | 4 +++-
 .../biometrics/face/FaceStatusPreferenceControllerTest.java | 5 ++++-
 .../FingerprintProfileStatusPreferenceControllerTest.java   | 5 ++++-
 9 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index 9626a29ac3d..23d2b6bf0dd 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -153,17 +153,17 @@
             android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
             settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="fingerprint_settings_profile"
             android:title="@string/security_settings_fingerprint_preference_title"
             android:summary="@string/summary_placeholder" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="face_settings_profile"
             android:title="@string/security_settings_face_preference_title"
             android:summary="@string/summary_placeholder" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_settings_profile"
             android:title="@string/security_settings_biometric_preference_title"
             android:summary="@string/summary_placeholder" />
diff --git a/res/xml/security_settings_combined_biometric.xml b/res/xml/security_settings_combined_biometric.xml
index edddbfcce22..a394b7b4688 100644
--- a/res/xml/security_settings_combined_biometric.xml
+++ b/res/xml/security_settings_combined_biometric.xml
@@ -26,14 +26,14 @@
         android:key="biometric_ways_to_unlock"
         android:title="@string/biometric_settings_category_ways_to_unlock">
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_face_settings"
             android:title="@string/security_settings_face_preference_title"
             android:summary="@string/summary_placeholder"
             settings:keywords="@string/keywords_face_settings"
             settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_fingerprint_settings"
             android:title="@string/security_settings_fingerprint_preference_title"
             android:summary="@string/summary_placeholder"
diff --git a/res/xml/security_settings_combined_biometric_profile.xml b/res/xml/security_settings_combined_biometric_profile.xml
index 57111528603..1a7fdff5c84 100644
--- a/res/xml/security_settings_combined_biometric_profile.xml
+++ b/res/xml/security_settings_combined_biometric_profile.xml
@@ -26,14 +26,14 @@
         android:key="biometric_ways_to_unlock"
         android:title="@string/biometric_settings_category_ways_to_unlock">
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_fingerprint_settings_profile"
             android:title="@string/security_settings_fingerprint_preference_title"
             android:summary="@string/summary_placeholder"
             settings:keywords="@string/keywords_fingerprint_settings"
             settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_face_settings_profile"
             android:title="@string/security_settings_face_preference_title"
             android:summary="@string/summary_placeholder"
diff --git a/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
index 9723d92a033..9cc95e1e55f 100644
--- a/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
@@ -61,7 +61,7 @@ public class CombinedBiometricStatusPreferenceController extends
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = screen.findPreference(KEY_BIOMETRIC_SETTINGS);
+        mPreference = screen.findPreference(mPreferenceKey);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
index 2b130ae244c..3a53f01b861 100644
--- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
@@ -53,7 +53,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = screen.findPreference(KEY_FACE_SETTINGS);
+        mPreference = screen.findPreference(mPreferenceKey);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
index 5166bae274d..56bfc68f019 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
@@ -52,7 +52,7 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = screen.findPreference(KEY_FINGERPRINT_SETTINGS);
+        mPreference = screen.findPreference(mPreferenceKey);
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java
index 4f0381da7ac..3b8744bac42 100644
--- a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java
@@ -48,6 +48,8 @@ import org.robolectric.shadows.ShadowApplication;
 @RunWith(RobolectricTestRunner.class)
 public class CombinedBiometricStatusPreferenceControllerTest {
 
+    private static final String TEST_PREF_KEY = "foo";
+
     @Mock
     private LockPatternUtils mLockPatternUtils;
     @Mock
@@ -80,7 +82,7 @@ public class CombinedBiometricStatusPreferenceControllerTest {
         when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
                 .thenReturn(mLockPatternUtils);
         when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
-        mController = new CombinedBiometricStatusPreferenceController(mContext);
+        mController = new CombinedBiometricStatusPreferenceController(mContext, TEST_PREF_KEY);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
index 0b104133071..92a7f4a25cf 100644
--- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
@@ -55,6 +55,9 @@ import java.util.Collections;
 
 @RunWith(RobolectricTestRunner.class)
 public class FaceStatusPreferenceControllerTest {
+
+    private static final String TEST_PREF_KEY = "baz";
+
     @Mock
     private LockPatternUtils mLockPatternUtils;
     @Mock
@@ -82,7 +85,7 @@ public class FaceStatusPreferenceControllerTest {
         when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
                 .thenReturn(mLockPatternUtils);
         when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
-        mController = new FaceStatusPreferenceController(mContext);
+        mController = new FaceStatusPreferenceController(mContext, TEST_PREF_KEY);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
index 0fa4a9c70ef..22ec7d0a1e5 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
@@ -44,6 +44,7 @@ import org.robolectric.shadows.ShadowApplication;
 @RunWith(RobolectricTestRunner.class)
 public class FingerprintProfileStatusPreferenceControllerTest {
 
+    private static final String TEST_PREF_KEY = "bar";
     private static final int FAKE_PROFILE_USER_ID = 1234;
 
     @Mock
@@ -73,7 +74,7 @@ public class FingerprintProfileStatusPreferenceControllerTest {
         when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
                 .thenReturn(mLockPatternUtils);
         when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
-        mController = new FingerprintProfileStatusPreferenceController(mContext);
+        mController = new FingerprintProfileStatusPreferenceController(mContext, TEST_PREF_KEY);
     }
 
     @Test
@@ -104,6 +105,8 @@ public class FingerprintProfileStatusPreferenceControllerTest {
 
     @Test
     public void getPreferenceKey_byDefault_returnsDefaultValue() {
+        mController = new FingerprintProfileStatusPreferenceController(mContext);
+
         assertThat(mController.getPreferenceKey()).isEqualTo("fingerprint_settings_profile");
     }