commit 50638c6a55faf6180cc6ee58c18066a6481e7d23
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 08 21:54:06 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 08 21:54:06 2021 +0000
tree c701ef4de8c3f0eddf8fb8ba47f9aa9659f343b7
parent a4402f4d44e590d269f89e327494e9dfac4d4cc6
parent 9099a0611cc7bd242cf197ee2eff79339f03fe06

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

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

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index b0f8ee1..92b6a08 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -5495,7 +5495,8 @@
             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);