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

UserTypeDetails.dump restrictions for SYSTEM

Browse Source 
The SYSTEM user does not get its default restrictions
from UserTypeDetails.mDefaultRestrictions; rather it gets
it from config_defaultFirstUserRestrictions. Therefore, we
now dump those restrictions from the latter (instead of
the former) for the SYSTEM user.

Fixes: 146793707
Test: manual check of: adb shell dumpsys user
Change-Id: I5cf04d20fe9edd748803634ec80336b267695ce6
This commit is contained in:
Adam Bookatz
2020-05-08 12:30:37 -07:00
parent f69c363d4a
commit eb80e75324
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/pm/UserTypeDetails.java
View File

@@ -255,8 +255,27 @@ public final class UserTypeDetails {
pw.print(prefix); pw.print("mDefaultUserInfoFlags: ");
pw.println(UserInfo.flagsToString(mDefaultUserInfoPropertyFlags));
pw.print(prefix); pw.print("mLabel: "); pw.println(mLabel);
pw.print(prefix); pw.println("mDefaultRestrictions: ");
UserRestrictionsUtils.dumpRestrictions(pw, prefix + " ", mDefaultRestrictions);
if (isSystem()) {
pw.print(prefix); pw.println("config_defaultFirstUserRestrictions: ");
try {
final Bundle restrictions = new Bundle();
final String[] defaultFirstUserRestrictions = Resources.getSystem().getStringArray(
com.android.internal.R.array.config_defaultFirstUserRestrictions);
for (String userRestriction : defaultFirstUserRestrictions) {
if (UserRestrictionsUtils.isValidRestriction(userRestriction)) {
restrictions.putBoolean(userRestriction, true);
}
}
UserRestrictionsUtils.dumpRestrictions(pw, prefix + " ", restrictions);
} catch (Resources.NotFoundException e) {
pw.print(prefix); pw.println(" none - resource not found");
}
} else {
pw.print(prefix); pw.println("mDefaultRestrictions: ");
UserRestrictionsUtils.dumpRestrictions(pw, prefix + " ", mDefaultRestrictions);
}
pw.print(prefix); pw.print("mIconBadge: "); pw.println(mIconBadge);
pw.print(prefix); pw.print("mBadgePlain: "); pw.println(mBadgePlain);
pw.print(prefix); pw.print("mBadgeNoBackground: "); pw.println(mBadgeNoBackground);