Merge "Undo not warning user-package-whitelist issues in logmode" into rvc-dev... (b7a0f87a) · Commits · e / os / android_frameworks_base

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));