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

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

Merge "Mark supervision-related methods in DPM as deprecated, suggesting... 

Merge "Mark supervision-related methods in DPM as deprecated, suggesting clients to use SupervisionManager instead." into main
parents 097f6985 91a38dea

core/java/android/app/admin/DevicePolicyManager.java

+4 −0
Original line number Diff line number Diff line
@@ -10328,7 +10328,9 @@ public class DevicePolicyManager { 
    /**

     * Returns the configured supervision app if it exists and is the device owner or policy owner.

     * @hide

     * @deprecated Use {@link android.app.supervision.SupervisionManager} methods instead.

     */

    @Deprecated

    public @Nullable ComponentName getProfileOwnerOrDeviceOwnerSupervisionComponent(

            @NonNull UserHandle user) {

        if (mService != null) {
@@ -10340,7 +10342,9 @@ public class DevicePolicyManager { 
    /**

     * Checks if the specified component is the supervision component.

     * @hide

     * @deprecated Use {@link android.app.supervision.SupervisionManager} methods instead.

     */

    @Deprecated

    public boolean isSupervisionComponent(@NonNull ComponentName who) {

        if (mService != null) {

            try {

core/java/android/app/admin/DevicePolicyManagerInternal.java

+4 −0
Original line number Diff line number Diff line
@@ -83,7 +83,9 @@ public abstract class DevicePolicyManagerInternal { 
    /**

     * @param userHandle the handle of the user whose profile owner is being fetched.

     * @return the configured supervision app if it exists and is the device owner or policy owner.

     * @deprecated Use {@link android.app.supervision.SupervisionManagerInternal} methods instead.

     */

    @Deprecated

    public abstract @Nullable ComponentName getProfileOwnerOrDeviceOwnerSupervisionComponent(

            @NonNull UserHandle userHandle);
@@ -114,7 +116,9 @@ public abstract class DevicePolicyManagerInternal { 
     *

     * @param uid App uid.

     * @return true if the uid is the active supervision app.

     * @deprecated Use {@link android.app.supervision.SupervisionManagerInternal} methods instead.

     */

    @Deprecated

    public abstract boolean isActiveSupervisionApp(int uid);



    /**