From 52f5f81009716a6fd1698721e3e6a72a4f078cc0 Mon Sep 17 00:00:00 2001
From: Adam Bookatz <bookatz@google.com>
Date: Thu, 28 May 2020 15:31:19 -0700
Subject: [PATCH] Undo not warning user-package-whitelist issues in logmode

ag/11465310 accidentally removed this line; it needs to be added back.

Bug: 154112291
Test: manual
Change-Id: I4f6f09b2dca753e2c289bc147b00d8a692edcd3a
---
 .../com/android/server/pm/UserSystemPackageInstaller.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
index 530c1158a2e02..58732b4c778f3 100644
--- a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
+++ b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
@@ -344,7 +344,7 @@ class UserSystemPackageInstaller {
      */
     @NonNull
     private List<String> getPackagesWhitelistErrors(@PackageWhitelistMode int mode) {
-        if ((!isEnforceMode(mode) || isImplicitWhitelistMode(mode))) {
+        if ((!isEnforceMode(mode) || isImplicitWhitelistMode(mode)) && !isLogMode(mode)) {
             return Collections.emptyList();
         }
 
@@ -753,7 +753,7 @@ class UserSystemPackageInstaller {
             mode = getDeviceDefaultWhitelistMode();
         }
         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;
         }
         Slog.v(TAG, "dumpPackageWhitelistProblems(): using mode " + modeToString(mode));