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

Commit 2f2178b7 authored by Atneya Nair's avatar Atneya Nair Committed by Android (Google) Code Review
Browse files

Merge "appop: Finish all when last in chain fail" into main

parents eefe8b0e c0bca399

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

+1 −2
Original line number Diff line number Diff line
@@ -1015,8 +1015,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                    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

                    && result != PermissionChecker.PERMISSION_SOFT_DENIED) {

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

                if (attributedOp == AppOpsManager.OP_NONE) {

                    finishDataDelivery(AppOpsManager.permissionToOpCode(permission),

                            attributionSource.asState(), fromDatasource);