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

Merge "Restricts PersonalAppsSuspensionHelper.dump() to system user." into sc-dev

Browse Source
This commit is contained in:
Felipe Leme
2021-03-09 19:02:44 +00:00
committed by Android (Google) Code Review
parent f0a755448b 1292d5808e
commit 8ead8216dd
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -1604,10 +1604,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
void setDevicePolicySafetyChecker(DevicePolicySafetyChecker safetyChecker) {
mSafetyChecker = safetyChecker;
}
void dumpPerUserData(IndentingPrintWriter pw, @UserIdInt int userId) {
PersonalAppsSuspensionHelper.forUser(mContext, userId).dump(pw);
}
}
/**
@@ -9251,15 +9247,23 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
private void dumpPerUserData(IndentingPrintWriter pw) {
int userCount = mUserData.size();
for (int userId = 0; userId < userCount; userId++) {
DevicePolicyData policy = getUserData(mUserData.keyAt(userId));
for (int i = 0; i < userCount; i++) {
int userId = mUserData.keyAt(i);
DevicePolicyData policy = getUserData(userId);
policy.dump(pw);
pw.println();
pw.increaseIndent();
mInjector.dumpPerUserData(pw, userId);
pw.decreaseIndent();
pw.println();
if (userId == UserHandle.USER_SYSTEM) {
pw.increaseIndent();
PersonalAppsSuspensionHelper.forUser(mContext, userId).dump(pw);
pw.decreaseIndent();
pw.println();
} else {
// pm.getUnsuspendablePackages() will fail if it's called for a different user;
// as this dump is mostly useful for system user anyways, we can just ignore the
// others (rather than changing the permission check in the PM method)
Slog.d(LOG_TAG, "skipping PersonalAppsSuspensionHelper.dump() for user " + userId);
}
}
}