Merge "Sysconfig takes precedence over update-time autoVerify" (d807ddf6) · Commits · e / os / android_frameworks_base

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

+16 −5

Original line number	Diff line number	Diff line
		@@ -1141,12 +1141,23 @@ public class PackageManagerService extends IPackageManager.Stub
		switch (userStatus) {
		case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS:
		if (!verified) {
		// Don't demote if sysconfig says 'always'
		SystemConfig systemConfig = SystemConfig.getInstance();
		ArraySet<String> packages = systemConfig.getLinkedApps();
		if (!packages.contains(packageName)) {
		// updatedStatus is already UNDEFINED
		needUpdate = true;

		if (DEBUG_DOMAIN_VERIFICATION) {
		Slog.d(TAG, "Formerly validated but now failing; demoting");
		}
		} else {
		if (DEBUG_DOMAIN_VERIFICATION) {
		Slog.d(TAG, "Updating bundled package " + packageName
		+ " failed autoVerify, but sysconfig supersedes");
		}
		// leave needUpdate == false here intentionally
		}
		}
		break;