Merge "Change scan flags before applying policy" (6b467529) · Commits · e / os / android_frameworks_base

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

+42 −41

Original line number	Diff line number	Diff line
		@@ -9604,10 +9604,11 @@ public class PackageManagerService extends IPackageManager.Stub
		this.originalPkgSetting = originalPkgSetting;
		this.realPkgName = realPkgName;
		this.parseFlags = parseFlags;
		this.scanFlags = adjustScanFlags(scanFlags, pkgSetting, disabledPkgSetting, user);
		this.scanFlags = scanFlags;
		this.isPlatformPackage = isPlatformPackage;
		this.user = user;
		}
		}

		/**
		* Returns the actual scan flags depending upon the state of the other settings.
		@@ -9651,11 +9652,10 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		return scanFlags;
		}
		}

		@GuardedBy("mInstallLock")
		private PackageParser.Package scanPackageNewLI(@NonNull PackageParser.Package pkg,
		final @ParseFlags int parseFlags, final @ScanFlags int scanFlags, long currentTime,
		final @ParseFlags int parseFlags, @ScanFlags int scanFlags, long currentTime,
		@Nullable UserHandle user) throws PackageManagerException {

		final String renamedPkgName = mSettings.getRenamedPackageLPr(pkg.mRealPackage);
		@@ -9673,6 +9673,7 @@ public class PackageManagerService extends IPackageManager.Stub
		+ " was transferred to another, but its .apk remains");
		}

		scanFlags = adjustScanFlags(scanFlags, pkgSetting, disabledPkgSetting, user);
		synchronized (mPackages) {
		applyPolicy(pkg, parseFlags, scanFlags);
		assertPackageIsValid(pkg, parseFlags, scanFlags);