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

DO NOT MERGE - Added system user packages blacklist / whitelist to dump() am: 7082688f29

Browse Source 
Change-Id: Ibeff793744bab49a8363dea5e891acd58795a757
This commit is contained in:
Automerger Merge Worker
2020-02-08 03:48:51 +00:00
parent 26905ee0dd 7082688f29
commit ad730d7573
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -2401,13 +2401,16 @@ public class PackageManagerService extends IPackageManager.Stub
/* systemAppsOnly */ false, UserHandle.SYSTEM));
// Apply whitelist for split system user
ArraySet<String> wlApps = SystemConfig.getInstance().getSystemUserWhitelistedApps();
enableApps.addAll(wlApps);
ArraySet<String> whitelistedSystemUserApps = SystemConfig.getInstance()
.getSystemUserWhitelistedApps();
enableApps.addAll(whitelistedSystemUserApps);
Log.i(TAG, "Whitelisted packages: " + whitelistedSystemUserApps);
}
// Apply blacklist for split system user/headless system user
ArraySet<String> blApps = SystemConfig.getInstance().getSystemUserBlacklistedApps();
enableApps.removeAll(blApps);
Log.i(TAG, "Blacklisted packages: " + blApps);
ArraySet<String> blacklistedSystemUserApps = SystemConfig.getInstance()
.getSystemUserBlacklistedApps();
enableApps.removeAll(blacklistedSystemUserApps);
Log.i(TAG, "Blacklisted packages: " + blacklistedSystemUserApps);
final int allAppsSize = allAps.size();
synchronized (mPackages) {
@@ -21722,6 +21725,13 @@ public class PackageManagerService extends IPackageManager.Stub
isSystemUserPackagesBlacklistSupported();
pw.println("isSystemUserPackagesBlacklistSupported: "
+ systemUserPackagesBlacklistSupported);
if (systemUserPackagesBlacklistSupported) {
SystemConfig sysconfig = SystemConfig.getInstance();
dumpPackagesList(pw, " ", "whitelist",
sysconfig.getSystemUserWhitelistedApps());
dumpPackagesList(pw, " ", "blacklist",
sysconfig.getSystemUserBlacklistedApps());
}
}
if (dumpState.isDumping(DumpState.DUMP_SHARED_USERS)) {
@@ -21831,6 +21841,21 @@ public class PackageManagerService extends IPackageManager.Stub
}
}
private void dumpPackagesList(PrintWriter pw, String prefix, String name,
ArraySet<String> list) {
pw.print(prefix); pw.print(name); pw.print(": ");
int size = list.size();
if (size == 0) {
pw.println("empty");
return;
}
pw.print(size); pw.println(" packages");
String prefix2 = prefix + " ";
for (int i = 0; i < size; i++) {
pw.print(prefix2); pw.println(list.valueAt(i));
}
}
//TODO: b/111402650
private void disableSkuSpecificApps() {
String apkList[] = mContext.getResources().getStringArray(