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

Commit 4cb58b4a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix DPM check logic for AppUsageLimitObserver (un)registering" into... 

Merge "Fix DPM check logic for AppUsageLimitObserver (un)registering" into rvc-dev am: 0a78a5ad am: ef36e6f8

Change-Id: Icd4f7ecaee66a8fb9e5acaa937b9846e672ab3b4
parents fab4faac ef36e6f8

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

            }