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

Commit 180ed62f authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Update intent for requesting parental consent" into sc-dev am: 1798ddbc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15132460

Change-Id: Ie425a34ebda0c67ec881679b08cca6486abdecea
parents a606bffe 1798ddbc

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);

        };