From a6f387423f2ef799ef7d032b8e7938e74baaa0d2 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Mon, 28 Jun 2021 15:42:04 -0700 Subject: [PATCH] Update intent for requesting parental consent Bug: 188847063 Test: adb shell settings put secure android.hardware.biometrics.ParentalControlsUtilsInternal.always_require_consent 1 settings > security > fingerprint press positive button adb logcat -b events (intent is sent) Change-Id: I72ab71d0dd53f66387e5c2ade510ef19c2b7f4e6 --- .../BiometricActionDisabledByAdminController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java b/packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java index 814d5d23f458c..1472980efd4ed 100644 --- a/packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java +++ b/packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java @@ -32,8 +32,10 @@ public class BiometricActionDisabledByAdminController extends BaseActionDisabled // These MUST not change, as they are the stable API between here and device admin specified // by the component below. - private static final String ACTION_LEARN_MORE = "android.settings.LEARN_MORE"; - private static final String EXTRA_FROM_BIOMETRIC_SETUP = "from_biometric_setup"; + private static final String ACTION_LEARN_MORE = + "android.intent.action.MANAGE_RESTRICTED_SETTING"; + private static final String EXTRA_SETTING_KEY = "extra_setting"; + private static final String EXTRA_SETTING_VALUE = "biometric_disabled_by_admin_controller"; BiometricActionDisabledByAdminController( DeviceAdminStringProvider stringProvider) { @@ -63,7 +65,7 @@ public class BiometricActionDisabledByAdminController extends BaseActionDisabled Log.d(TAG, "Positive button clicked, component: " + enforcedAdmin.component); final Intent intent = new Intent(ACTION_LEARN_MORE) .setComponent(enforcedAdmin.component) - .putExtra(EXTRA_FROM_BIOMETRIC_SETUP, true) + .putExtra(EXTRA_SETTING_KEY, EXTRA_SETTING_VALUE) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent); };