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

Merge "Undo not warning user-package-whitelist issues in logmode" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-29 01:57:38 +00:00
committed by Android (Google) Code Review
parent 0b4de9e604 52f5f81009
commit cc56e2551c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
View File

@@ -344,7 +344,7 @@ class UserSystemPackageInstaller {
*/ */
@NonNull @NonNull
private List<String> getPackagesWhitelistErrors(@PackageWhitelistMode int mode) { private List<String> getPackagesWhitelistErrors(@PackageWhitelistMode int mode) {
if ((!isEnforceMode(mode) || isImplicitWhitelistMode(mode))) { if ((!isEnforceMode(mode) || isImplicitWhitelistMode(mode)) && !isLogMode(mode)) {
return Collections.emptyList(); return Collections.emptyList();
} }
@@ -753,7 +753,7 @@ class UserSystemPackageInstaller {
mode = getDeviceDefaultWhitelistMode(); mode = getDeviceDefaultWhitelistMode();
} }
if (criticalOnly) { if (criticalOnly) {
// Flip-out log mode // Ignore log mode (if set) since log-only issues are not critical.
mode &= ~USER_TYPE_PACKAGE_WHITELIST_MODE_LOG; mode &= ~USER_TYPE_PACKAGE_WHITELIST_MODE_LOG;
} }
Slog.v(TAG, "dumpPackageWhitelistProblems(): using mode " + modeToString(mode)); Slog.v(TAG, "dumpPackageWhitelistProblems(): using mode " + modeToString(mode));