From d16c12b9ac1db96b3dc3976e1fbd82951eeafec6 Mon Sep 17 00:00:00 2001 From: Yuri Ufimtsev Date: Wed, 30 Mar 2022 18:55:01 +0000 Subject: [PATCH] Set up correct ComponentName for test mode of Parental Controls Test: manual Bug: 222339681 Change-Id: I9c141b8f04a69c914a55ed176c2f1c101d22a34c --- .../settings/biometrics/ParentalControlsUtils.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics/ParentalControlsUtils.java b/src/com/android/settings/biometrics/ParentalControlsUtils.java index 0959184b16f..8dd01f0ea57 100644 --- a/src/com/android/settings/biometrics/ParentalControlsUtils.java +++ b/src/com/android/settings/biometrics/ParentalControlsUtils.java @@ -41,16 +41,19 @@ public class ParentalControlsUtils { /** * Public version that enables test paths, see - * {@link android.hardware.biometrics.ParentalControlsUtilsInternal#isTestModeEnabled(Context)} + * {@link android.hardware.biometrics.ParentalControlsUtilsInternal#getTestComponentName} * @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 (ParentalControlsUtilsInternal.isTestModeEnabled(context)) { + final int userId = UserHandle.myUserId(); + final UserHandle userHandle = new UserHandle(userId); + final ComponentName testComponentName = ParentalControlsUtilsInternal.getTestComponentName( + context, userId); + if (testComponentName != null) { Log.d(TAG, "Requiring consent for test flow"); - return new RestrictedLockUtils.EnforcedAdmin(null /* ComponentName */, + return new RestrictedLockUtils.EnforcedAdmin(testComponentName, UserManager.DISALLOW_BIOMETRIC, userHandle); }