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

Commit 01334b2f authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Make CheckOp return allowed if any attr tag for a package is excluded"... 

Merge "Make CheckOp return allowed if any attr tag for a package is excluded" into tm-dev am: 849feb64

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



Change-Id: I13b1092d9450911c0ee18a2e4435be97e993e589
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d4c1d0d 849feb64

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

+13 −7
Original line number Original line Diff line number Diff line
@@ -3258,7 +3258,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
            return AppOpsManager.MODE_IGNORED;

            return AppOpsManager.MODE_IGNORED;

        }

        }

        synchronized (this) {

        synchronized (this) {

            if (isOpRestrictedLocked(uid, code, packageName, attributionTag, pvr.bypass)) {

            if (isOpRestrictedLocked(uid, code, packageName, attributionTag, pvr.bypass, true)) {

                return AppOpsManager.MODE_IGNORED;

                return AppOpsManager.MODE_IGNORED;

            }

            }

            code = AppOpsManager.opToSwitch(code);

            code = AppOpsManager.opToSwitch(code);
@@ -3483,7 +3483,7 @@ public class AppOpsService extends IAppOpsService.Stub { 




            final int switchCode = AppOpsManager.opToSwitch(code);

            final int switchCode = AppOpsManager.opToSwitch(code);

            final UidState uidState = ops.uidState;

            final UidState uidState = ops.uidState;

            if (isOpRestrictedLocked(uid, code, packageName, attributionTag, pvr.bypass)) {

            if (isOpRestrictedLocked(uid, code, packageName, attributionTag, pvr.bypass, false)) {

                attributedOp.rejected(uidState.state, flags);

                attributedOp.rejected(uidState.state, flags);

                scheduleOpNotedIfNeededLocked(code, uid, packageName, attributionTag, flags,

                scheduleOpNotedIfNeededLocked(code, uid, packageName, attributionTag, flags,

                        AppOpsManager.MODE_IGNORED);

                        AppOpsManager.MODE_IGNORED);
@@ -3997,7 +3997,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
            final Op op = getOpLocked(ops, code, uid, true);

            final Op op = getOpLocked(ops, code, uid, true);

            final AttributedOp attributedOp = op.getOrCreateAttribution(op, attributionTag);

            final AttributedOp attributedOp = op.getOrCreateAttribution(op, attributionTag);

            final UidState uidState = ops.uidState;

            final UidState uidState = ops.uidState;

            isRestricted = isOpRestrictedLocked(uid, code, packageName, attributionTag, pvr.bypass);

            isRestricted = isOpRestrictedLocked(uid, code, packageName, attributionTag, pvr.bypass,

                    false);

            final int switchCode = AppOpsManager.opToSwitch(code);

            final int switchCode = AppOpsManager.opToSwitch(code);

            // If there is a non-default per UID policy (we set UID op mode only if

            // If there is a non-default per UID policy (we set UID op mode only if

            // non-default) it takes over, otherwise use the per package policy.

            // non-default) it takes over, otherwise use the per package policy.
@@ -4834,7 +4835,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
    }

    }





    private boolean isOpRestrictedLocked(int uid, int code, String packageName,

    private boolean isOpRestrictedLocked(int uid, int code, String packageName,

            String attributionTag, @Nullable RestrictionBypass appBypass) {

            String attributionTag, @Nullable RestrictionBypass appBypass, boolean isCheckOp) {

        int restrictionSetCount = mOpGlobalRestrictions.size();

        int restrictionSetCount = mOpGlobalRestrictions.size();





        for (int i = 0; i < restrictionSetCount; i++) {

        for (int i = 0; i < restrictionSetCount; i++) {
@@ -4851,7 +4852,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
            // For each client, check that the given op is not restricted, or that the given

            // For each client, check that the given op is not restricted, or that the given

            // package is exempt from the restriction.

            // package is exempt from the restriction.

            ClientUserRestrictionState restrictionState = mOpUserRestrictions.valueAt(i);

            ClientUserRestrictionState restrictionState = mOpUserRestrictions.valueAt(i);

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

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

                    isCheckOp)) {

                RestrictionBypass opBypass = opAllowSystemBypassRestriction(code);

                RestrictionBypass opBypass = opAllowSystemBypassRestriction(code);

                if (opBypass != null) {

                if (opBypass != null) {

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

                    // If we are the system, bypass user restrictions for certain codes
@@ -7224,7 +7226,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
        }

        }





        public boolean hasRestriction(int restriction, String packageName, String attributionTag,

        public boolean hasRestriction(int restriction, String packageName, String attributionTag,

                int userId) {

                int userId, boolean isCheckOp) {

            if (perUserRestrictions == null) {

            if (perUserRestrictions == null) {

                return false;

                return false;

            }

            }
@@ -7243,6 +7245,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
                return true;

                return true;

            }

            }





            if (isCheckOp) {

                return !perUserExclusions.includes(packageName);

            }

            return !perUserExclusions.contains(packageName, attributionTag);

            return !perUserExclusions.contains(packageName, attributionTag);

        }

        }
@@ -7409,7 +7414,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
                int numRestrictions = mOpUserRestrictions.size();

                int numRestrictions = mOpUserRestrictions.size();

                for (int i = 0; i < numRestrictions; i++) {

                for (int i = 0; i < numRestrictions; i++) {

                    if (mOpUserRestrictions.valueAt(i)

                    if (mOpUserRestrictions.valueAt(i)

                            .hasRestriction(code, pkg, attributionTag, user.getIdentifier())) {

                            .hasRestriction(code, pkg, attributionTag, user.getIdentifier(),

                                    false)) {

                        number++;

                        number++;

                    }

                    }

                }

                }