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

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

Merge "Ensure that SOFT_DENIED doesn't result in a call to finishOp" into sc-dev am: 50638c6a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14905110

Change-Id: Iabfe3da0071d23f9757902fbfd85223666ed303a
parents 6cabb8c9 50638c6a

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -5495,7 +5495,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            final int result = checkPermission(mContext, permission, attributionSource, message,

                    forDataDelivery, startDataDelivery, fromDatasource, attributedOp);

            // Finish any started op if some step in the attribution chain failed.

            if (startDataDelivery && result != PermissionChecker.PERMISSION_GRANTED) {

            if (startDataDelivery && result != PermissionChecker.PERMISSION_GRANTED

                    && result != PermissionChecker.PERMISSION_SOFT_DENIED) {

                if (attributedOp == AppOpsManager.OP_NONE) {

                    finishDataDelivery(AppOpsManager.permissionToOpCode(permission),

                            attributionSource.asState(), fromDatasource);