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

Merge "Throw SecurityException as if no CLEAR_APP_USER_DATA permission"

Browse Source
This commit is contained in:
Jing Ji
2021-07-13 23:31:51 +00:00
committed by Android (Google) Code Review
parent a33fc522d0 bb323058dd
commit 3c299e995d
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -3458,30 +3458,39 @@ public class ActivityManagerService extends IActivityManager.Stub
final long callingId = Binder.clearCallingIdentity();
try {
IPackageManager pm = AppGlobals.getPackageManager();
boolean permitted = true;
// Instant packages are not protected
if (getPackageManagerInternal().isPackageDataProtected(
resolvedUserId, packageName)) {
throw new SecurityException(
"Cannot clear data for a protected package: " + packageName);
if (ActivityManager.checkUidPermission(android.Manifest.permission.MANAGE_USERS,
uid) == PERMISSION_GRANTED) {
// The caller has the MANAGE_USERS permission, tell them what's going on.
throw new SecurityException(
"Cannot clear data for a protected package: " + packageName);
} else {
permitted = false; // fall through and throw the SecurityException below.
}
}
ApplicationInfo applicationInfo = null;
try {
applicationInfo = pm.getApplicationInfo(packageName,
MATCH_UNINSTALLED_PACKAGES, resolvedUserId);
} catch (RemoteException e) {
/* ignore */
if (permitted) {
try {
applicationInfo = pm.getApplicationInfo(packageName,
MATCH_UNINSTALLED_PACKAGES, resolvedUserId);
} catch (RemoteException e) {
/* ignore */
}
permitted = (applicationInfo != null && applicationInfo.uid == uid) // own uid data
|| (checkComponentPermission(permission.CLEAR_APP_USER_DATA,
pid, uid, -1, true) == PackageManager.PERMISSION_GRANTED);
}
appInfo = applicationInfo;
final boolean clearingOwnUidData = appInfo != null && appInfo.uid == uid;
if (!clearingOwnUidData && checkComponentPermission(permission.CLEAR_APP_USER_DATA,
pid, uid, -1, true) != PackageManager.PERMISSION_GRANTED) {
if (!permitted) {
throw new SecurityException("PID " + pid + " does not have permission "
+ android.Manifest.permission.CLEAR_APP_USER_DATA + " to clear data"
+ " of package " + packageName);
}
appInfo = applicationInfo;
final boolean hasInstantMetadata = getPackageManagerInternal()
.hasInstantApplicationMetadata(packageName, resolvedUserId);