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

Commit 402456a5 authored by Vitor Carvalho's avatar Vitor Carvalho Committed by Android (Google) Code Review
Browse files

Merge "Replace usage of DPM supervision methods in... 

Merge "Replace usage of DPM supervision methods in ActionDisabledByAdminControllerFactory with calls to SupervisionManager." into main
parents 9364b9e9 21e6915b

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

+13 −6
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.settingslib.enterprise.ActionDisabledLearnMoreButtonLa 
import static com.android.settingslib.enterprise.ManagedDeviceActionDisabledByAdminController.DEFAULT_FOREGROUND_USER_CHECKER;

import static com.android.settingslib.enterprise.ManagedDeviceActionDisabledByAdminController.DEFAULT_FOREGROUND_USER_CHECKER;





import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManager;

import android.app.supervision.SupervisionManager;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.BiometricAuthenticator;
@@ -59,6 +60,11 @@ public final class ActionDisabledByAdminControllerFactory { 
    }

    }





    private static boolean isSupervisedDevice(Context context) {

    private static boolean isSupervisedDevice(Context context) {

        if (android.app.supervision.flags.Flags.deprecateDpmSupervisionApis()) {

            SupervisionManager supervisionManager =

                    context.getSystemService(SupervisionManager.class);

            return supervisionManager.isSupervisionEnabledForUser(UserHandle.myUserId());

        } else {

            DevicePolicyManager devicePolicyManager =

            DevicePolicyManager devicePolicyManager =

                    context.getSystemService(DevicePolicyManager.class);

                    context.getSystemService(DevicePolicyManager.class);

            ComponentName supervisionComponent =

            ComponentName supervisionComponent =
@@ -66,6 +72,7 @@ public final class ActionDisabledByAdminControllerFactory { 
                            new UserHandle(UserHandle.myUserId()));

                            new UserHandle(UserHandle.myUserId()));

            return supervisionComponent != null;

            return supervisionComponent != null;

        }

        }

    }





    /**

    /**

     * @return true if the restriction == UserManager.DISALLOW_BIOMETRIC and parental consent

     * @return true if the restriction == UserManager.DISALLOW_BIOMETRIC and parental consent