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

Commit e202e0b9 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: ca3802a6

Change-Id: Ic8a8628ac0c53941de577d75f99c406d4a6d05b8
parents 04ec6bfb ca3802a6

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

            }