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

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

Merge "Allow self blames to be trusted"

parents 4e3d12dd 4d4d8e2f

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

+4 −2
Original line number Diff line number Diff line
@@ -3059,9 +3059,10 @@ public class AppOpsService extends IAppOpsService.Stub { 
        // This is a workaround for R QPR, new API change is not allowed. We only allow the current

        // voice recognizer is also the voice interactor to noteproxy op.

        final boolean isTrustVoiceServiceProxy = isTrustedVoiceServiceProxy(proxyPackageName, code);

        final boolean isSelfBlame = Binder.getCallingUid() == proxiedUid;

        final boolean isProxyTrusted = mContext.checkPermission(

                Manifest.permission.UPDATE_APP_OPS_STATS, -1, proxyUid)

                == PackageManager.PERMISSION_GRANTED || isTrustVoiceServiceProxy;

                == PackageManager.PERMISSION_GRANTED || isTrustVoiceServiceProxy || isSelfBlame;



        final int proxyFlags = isProxyTrusted ? AppOpsManager.OP_FLAG_TRUSTED_PROXY

                : AppOpsManager.OP_FLAG_UNTRUSTED_PROXY;
@@ -3526,9 +3527,10 @@ public class AppOpsService extends IAppOpsService.Stub { 
        // This is a workaround for R QPR, new API change is not allowed. We only allow the current

        // voice recognizer is also the voice interactor to noteproxy op.

        final boolean isTrustVoiceServiceProxy = isTrustedVoiceServiceProxy(proxyPackageName, code);

        final boolean isSelfBlame = Binder.getCallingUid() == proxiedUid;

        final boolean isProxyTrusted = mContext.checkPermission(

                Manifest.permission.UPDATE_APP_OPS_STATS, -1, proxyUid)

                == PackageManager.PERMISSION_GRANTED || isTrustVoiceServiceProxy;

                == PackageManager.PERMISSION_GRANTED || isTrustVoiceServiceProxy || isSelfBlame;



        final int proxyFlags = isProxyTrusted ? AppOpsManager.OP_FLAG_TRUSTED_PROXY

                : AppOpsManager.OP_FLAG_UNTRUSTED_PROXY;