Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I868d285dffbae05c0c235f298da895623bb899a3
This commit is contained in:
TreeHugger Robot
2021-06-08 22:14:50 +00:00
committed by Automerger Merge Worker
parent 75c33d9aff 50638c6a55
commit bb7a8d0a41
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -5495,7 +5495,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
final int result = checkPermission(mContext, permission, attributionSource, message, final int result = checkPermission(mContext, permission, attributionSource, message,
forDataDelivery, startDataDelivery, fromDatasource, attributedOp); forDataDelivery, startDataDelivery, fromDatasource, attributedOp);
// Finish any started op if some step in the attribution chain failed. // 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) { if (attributedOp == AppOpsManager.OP_NONE) {
finishDataDelivery(AppOpsManager.permissionToOpCode(permission), finishDataDelivery(AppOpsManager.permissionToOpCode(permission),
attributionSource.asState(), fromDatasource); attributionSource.asState(), fromDatasource);