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

Commit e2492713 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev am: 653e7bed am: 1c49c33f 

am: c168f27c

* commit 'c168f27c':
  Fixing isOpRestricted in AppOpsService

Change-Id: I6504a1893f470dc8b083acad9157f6fe6bd490a0
parents f3a7437e c168f27c

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;

            }

        }