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

Commit 0a78a5ad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix DPM check logic for AppUsageLimitObserver (un)registering" into rvc-dev

parents 8c018bac cfe8c66a

services/usage/java/com/android/server/usage/UsageStatsService.java

+2 −2
Original line number Diff line number Diff line
@@ -1847,7 +1847,7 @@ public class UsageStatsService extends SystemService implements 
            final DevicePolicyManagerInternal dpmInternal = getDpmInternal();

            if (!hasPermissions(callingPackage,

                    Manifest.permission.SUSPEND_APPS, Manifest.permission.OBSERVE_APP_USAGE)

                    && (dpmInternal != null && !dpmInternal.isActiveSupervisionApp(callingUid))) {

                    && (dpmInternal == null || !dpmInternal.isActiveSupervisionApp(callingUid))) {

                throw new SecurityException("Caller must be the active supervision app or "

                        + "it must have both SUSPEND_APPS and OBSERVE_APP_USAGE permissions");

            }
@@ -1874,7 +1874,7 @@ public class UsageStatsService extends SystemService implements 
            final DevicePolicyManagerInternal dpmInternal = getDpmInternal();

            if (!hasPermissions(callingPackage,

                    Manifest.permission.SUSPEND_APPS, Manifest.permission.OBSERVE_APP_USAGE)

                    && (dpmInternal != null && !dpmInternal.isActiveSupervisionApp(callingUid))) {

                    && (dpmInternal == null || !dpmInternal.isActiveSupervisionApp(callingUid))) {

                throw new SecurityException("Caller must be the active supervision app or "

                        + "it must have both SUSPEND_APPS and OBSERVE_APP_USAGE permissions");

            }