Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1798ddbc authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Update intent for requesting parental consent" into sc-dev

parents 931584a9 a6f38742

packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java

+5 −3
Original line number Diff line number Diff line
@@ -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);

        };