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

Commit 88d4dea9 authored by Ashwini Oruganti's avatar Ashwini Oruganti Committed by Hui Wang
Browse files

Update the BroadcastQueue logic for runtime permissions 

Previously, we were skipping a broadcast when either the permission or
the app op was granted. However, for runtime permissions to be
considered "granted" both the permission and the app op need to be
granted. This change updates taking this into account.

Test: manual
Bug: 202436287
Bug: 183537857
Change-Id: I9f12f9e17e61246d723d18ead93c6115bbf6d5cf
parent bbed6928

services/core/java/com/android/server/am/BroadcastQueue.java

+13 −7
Original line number Diff line number Diff line
@@ -1568,17 +1568,23 @@ public final class BroadcastQueue { 
                    perm = PackageManager.PERMISSION_DENIED;

                }



                if (perm == PackageManager.PERMISSION_GRANTED) {

                    skip = true;

                    break;

                }



                int appOp = AppOpsManager.permissionToOpCode(excludedPermission);

                if (appOp != AppOpsManager.OP_NONE) {

                    if (mService.getAppOpsManager().checkOpNoThrow(appOp,

                    // When there is an app op associated with the permission,

                    // skip when both the permission and the app op are

                    // granted.

                    if ((perm == PackageManager.PERMISSION_GRANTED) && (

                                mService.getAppOpsManager().checkOpNoThrow(appOp,

                                info.activityInfo.applicationInfo.uid,

                                info.activityInfo.packageName)

                            == AppOpsManager.MODE_ALLOWED) {

                            == AppOpsManager.MODE_ALLOWED)) {

                        skip = true;

                        break;

                    }

                } else {

                    // When there is no app op associated with the permission,

                    // skip when permission is granted.

                    if (perm == PackageManager.PERMISSION_GRANTED) {

                        skip = true;

                        break;

                    }