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

Commit ac583c60 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by The Android Automerger
Browse files

Fixing isOpRestricted in AppOpsService 

AppOpsService was returning false for a restricted operation if the
operation did not allow the system to bypass the restrictions on it.

Bug: 28860721
Change-Id: I487e23f1d3bf6ea602caee439fb500c058e7c8ff
parent 7119da68

services/core/java/com/android/server/AppOpsService.java

+8 −7
Original line number Diff line number Diff line
@@ -1316,8 +1316,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
            // For each client, check that the given op is not restricted, or that the given

            // package is exempt from the restriction.

            ClientRestrictionState restrictionState = mOpUserRestrictions.valueAt(i);

            if (restrictionState.hasRestriction(code, packageName, userHandle)

                    && AppOpsManager.opAllowSystemBypassRestriction(code)) {

            if (restrictionState.hasRestriction(code, packageName, userHandle)) {

                if (AppOpsManager.opAllowSystemBypassRestriction(code)) {

                    // If we are the system, bypass user restrictions for certain codes

                    synchronized (this) {

                        Ops ops = getOpsRawLocked(uid, packageName, true);
@@ -1325,6 +1325,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                            return false;

                        }

                    }

                }

                return true;

            }

        }