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

Commit 8cf5ca33 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I515247c938ac0f3767c7d0031d3a54bc25d0e0a9
parents e9da6b3e 678a57b0

src/com/android/settings/biometrics/ParentalControlsUtils.java

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.ParentalControlsUtilsInternal;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;



import androidx.annotation.NonNull;
@@ -49,7 +50,8 @@ public class ParentalControlsUtils { 
        final UserHandle userHandle = new UserHandle(UserHandle.myUserId());

        if (ParentalControlsUtilsInternal.isTestModeEnabled(context)) {

            Log.d(TAG, "Requiring consent for test flow");

            return new RestrictedLockUtils.EnforcedAdmin(null /* ComponentName */, userHandle);

            return new RestrictedLockUtils.EnforcedAdmin(null /* ComponentName */,

                    UserManager.DISALLOW_BIOMETRIC, userHandle);

        }



        final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
@@ -69,7 +71,8 @@ public class ParentalControlsUtils { 
                userHandle)) {

            final ComponentName cn =

                    ParentalControlsUtilsInternal.getSupervisionComponentName(dpm, userHandle);

            return new RestrictedLockUtils.EnforcedAdmin(cn, userHandle);

            return new RestrictedLockUtils.EnforcedAdmin(cn, UserManager.DISALLOW_BIOMETRIC,

                    userHandle);

        } else {

            return null;

        }

src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class ActionDisabledByAdminDialog extends Activity 
        final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =

                getAdminDetailsFromIntent(getIntent());

        final String restriction = getRestrictionFromIntent(getIntent());

        mDialogHelper = new ActionDisabledByAdminDialogHelper(this);

        mDialogHelper = new ActionDisabledByAdminDialogHelper(this, restriction);

        mDialogHelper.prepareDialogBuilder(restriction, enforcedAdmin)

                .setOnDismissListener(this)

                .show();

src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java

+8 −2
Original line number Diff line number Diff line
@@ -56,11 +56,16 @@ public final class ActionDisabledByAdminDialogHelper { 
    private final Activity mActivity;



    public ActionDisabledByAdminDialogHelper(Activity activity) {

        this(activity, null /* restriction */);

    }



    public ActionDisabledByAdminDialogHelper(Activity activity, String restriction) {

        mActivity = activity;

        mDialogView = (ViewGroup) LayoutInflater.from(mActivity).inflate(

                R.layout.admin_support_details_dialog, null);

        mActionDisabledByAdminController = ActionDisabledByAdminControllerFactory

                .createInstance(mActivity, new DeviceAdminStringProviderImpl(mActivity));

                .createInstance(mActivity, restriction,

                        new DeviceAdminStringProviderImpl(mActivity));

    }



    private @UserIdInt int getEnforcementAdminUserId(@NonNull EnforcedAdmin admin) {
@@ -74,7 +79,8 @@ public final class ActionDisabledByAdminDialogHelper { 
    public AlertDialog.Builder prepareDialogBuilder(String restriction,

            EnforcedAdmin enforcedAdmin) {

        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity)

                .setPositiveButton(R.string.okay, null)

                .setPositiveButton(R.string.okay,

                        mActionDisabledByAdminController.getPositiveButtonListener())

                .setView(mDialogView);

        prepareDialogBuilder(builder, restriction, enforcedAdmin);

        return builder;

tests/unit/src/com/android/settings/biometrics/ParentalControlsUtilsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import static android.hardware.biometrics.BiometricAuthenticator.TYPE_IRIS; 


import android.hardware.biometrics.BiometricAuthenticator;

import android.os.UserHandle;

import android.os.UserManager;



import androidx.annotation.Nullable;

import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -92,6 +93,7 @@ public class ParentalControlsUtilsTest { 
                    mSupervisionComponentName, tests[i][0] /* modality */,

                    tests[i][1] /* keyguardDisableFlags */);

            assertNotNull(admin);

            assertEquals(UserManager.DISALLOW_BIOMETRIC, admin.enforcedRestriction);

            assertEquals(mSupervisionComponentName, admin.component);

        }

    }