Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nate Myren
2021-06-07 16:24:33 +00:00
committed by Android (Google) Code Review
parent f11c269831 8bda70f116
commit 1a4ff1df12
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -4483,8 +4483,9 @@ public class AppOpsService extends IAppOpsService.Stub {
// Special case for the shell which is a package but should be able // Special case for the shell which is a package but should be able
// to bypass app attribution tag restrictions. // to bypass app attribution tag restrictions.
if (pkgUid != UserHandle.getAppId(uid)) { 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 " throw new SecurityException("Specified package " + packageName + " under uid "
+ UserHandle.getAppId(uid) + " but it is really " + pkgUid); + UserHandle.getAppId(uid) + otherUidMessage);
} }
return RestrictionBypass.UNRESTRICTED; return RestrictionBypass.UNRESTRICTED;
} }
@@ -4544,8 +4545,9 @@ public class AppOpsService extends IAppOpsService.Stub {
} }
if (pkgUid != uid) { if (pkgUid != uid) {
String otherUidMessage = DEBUG ? " but it is really " + pkgUid : " but it is not";
throw new SecurityException("Specified package " + packageName + " under uid " + uid throw new SecurityException("Specified package " + packageName + " under uid " + uid
+ " but it is really " + pkgUid); + otherUidMessage);
} }
return bypass; return bypass;