Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6962ba41 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: Id571f20a3088ba623c7b5a30efdacf04aeb64359
parents 0d363390 cc56e255

services/core/java/com/android/server/pm/UserSystemPackageInstaller.java

+2 −2
Original line number Diff line number Diff line
@@ -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));