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

Commit 5ec2bc88 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Fix issue #109746350: startWatchingMode fails on P" into pi-dev am: e6fde145 

am: ea796ab0

Change-Id: I7c51ca67c5e0b4418a0752768a60cabc210a6432
parents 279c4597 ea796ab0

services/core/java/com/android/server/AppOpsService.java

+4 −4
Original line number Diff line number Diff line
@@ -1335,10 +1335,10 @@ public class AppOpsService extends IAppOpsService.Stub { 
        int watchedUid = -1;

        final int callingUid = Binder.getCallingUid();

        final int callingPid = Binder.getCallingPid();

        if (mContext.checkCallingOrSelfPermission(Manifest.permission.WATCH_APPOPS)

                != PackageManager.PERMISSION_GRANTED) {

            watchedUid = callingUid;

        }

        // TODO: should have a privileged permission to protect this.

        // Also, if the caller has requested WATCH_FOREGROUND_CHANGES, should we require

        // the USAGE_STATS permission since this can provide information about when an

        // app is in the foreground?

        Preconditions.checkArgumentInRange(op, AppOpsManager.OP_NONE,

                AppOpsManager._NUM_OP - 1, "Invalid op code: " + op);

        if (callback == null) {