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

Commit 1a4ff1df authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Make AppOpsService verification error less informative" into sc-dev

parents f11c2698 8bda70f1

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

+4 −2
Original line number Diff line number Diff line
@@ -4483,8 +4483,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
            // Special case for the shell which is a package but should be able

            // to bypass app attribution tag restrictions.

            if (pkgUid != UserHandle.getAppId(uid)) {

                String otherUidMessage = DEBUG ? " but it is really " + pkgUid : " but it is not";

                throw new SecurityException("Specified package " + packageName + " under uid "

                        +  UserHandle.getAppId(uid) + " but it is really " + pkgUid);

                        +  UserHandle.getAppId(uid) + otherUidMessage);

            }

            return RestrictionBypass.UNRESTRICTED;

        }
@@ -4544,8 +4545,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
        }



        if (pkgUid != uid) {

            String otherUidMessage = DEBUG ? " but it is really " + pkgUid : " but it is not";

            throw new SecurityException("Specified package " + packageName + " under uid " + uid

                    + " but it is really " + pkgUid);

                    + otherUidMessage);

        }



        return bypass;