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

Commit 37a01027 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Allow self-blaming in noteProxyOp and startProxyOp"

parents 66f3c3ec 4cf0958a

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

+2 −3
Original line number Diff line number Diff line
@@ -3065,7 +3065,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
        final int proxyMode = noteOperationUnchecked(code, proxyUid, resolveProxyPackageName,

                proxyAttributionTag, Process.INVALID_UID, null, null, proxyFlags,

                !isProxyTrusted, "proxy " + message, shouldCollectMessage);

        if (proxyMode != AppOpsManager.MODE_ALLOWED || Binder.getCallingUid() == proxiedUid) {

        if (proxyMode != AppOpsManager.MODE_ALLOWED) {

            return proxyMode;

        }
@@ -3550,8 +3550,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                resolvedProxyPackageName, proxyAttributionTag, Process.INVALID_UID, null, null,

                proxyFlags, startIfModeDefault, !isProxyTrusted, "proxy " + message,

                shouldCollectMessage, false);

        if (!shouldStartForMode(proxyMode, startIfModeDefault)

                || Binder.getCallingUid() == proxiedUid) {

        if (!shouldStartForMode(proxyMode, startIfModeDefault)) {

            return proxyMode;

        }