Merge "Refine last static lib version lookup." (06425229) · Commits · e / os / android_frameworks_base

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

+16 −19

Original line number	Original line	Diff line number	Diff line
	@@ -955,14 +955,13 @@ final class InstallPackageHelper {
	createdAppId.put(packageName, optimisticallyRegisterAppId(result));		createdAppId.put(packageName, optimisticallyRegisterAppId(result));
	versionInfos.put(result.mPkgSetting.getPkg().getPackageName(),		versionInfos.put(result.mPkgSetting.getPkg().getPackageName(),
	mPm.getSettingsVersionForPackage(result.mPkgSetting.getPkg()));		mPm.getSettingsVersionForPackage(result.mPkgSetting.getPkg()));
	if (result.mStaticSharedLibraryInfo != null		if (result.mStaticSharedLibraryInfo != null) {
	\|\| result.mSdkSharedLibraryInfo != null) {		final PackageSetting staticSharedLibLatestVersionSetting =
	final PackageSetting sharedLibLatestVersionSetting =		mSharedLibraries.getStaticSharedLibLatestVersionSetting(result);
	mSharedLibraries.getSharedLibLatestVersionSetting(result);		if (staticSharedLibLatestVersionSetting != null) {
	if (sharedLibLatestVersionSetting != null) {
	lastStaticSharedLibSettings.put(		lastStaticSharedLibSettings.put(
	result.mPkgSetting.getPkg().getPackageName(),		result.mPkgSetting.getPkg().getPackageName(),
	sharedLibLatestVersionSetting);		staticSharedLibLatestVersionSetting);
	}		}
	}		}
	} catch (PackageManagerException e) {		} catch (PackageManagerException e) {
	@@ -3585,22 +3584,20 @@ final class InstallPackageHelper {
	boolean appIdCreated = false;		boolean appIdCreated = false;
	try {		try {
	final String pkgName = scanResult.mPkgSetting.getPackageName();		final String pkgName = scanResult.mPkgSetting.getPackageName();
	final Map<String, ReconciledPackage> reconcileResult =		final ReconcileRequest reconcileRequest = new ReconcileRequest(
	ReconcilePackageUtils.reconcilePackages(
	new ReconcileRequest(
	Collections.singletonMap(pkgName, scanResult),		Collections.singletonMap(pkgName, scanResult),
	mSharedLibraries.getAll(),		mSharedLibraries.getAll(), mPm.mPackages,
	mPm.mPackages,		Collections.singletonMap(pkgName,
	Collections.singletonMap(		mPm.getSettingsVersionForPackage(parsedPackage)),
	pkgName,		Collections.singletonMap(pkgName,
	mPm.getSettingsVersionForPackage(		mSharedLibraries.getStaticSharedLibLatestVersionSetting(
	parsedPackage)),		scanResult)));
	Collections.singletonMap(pkgName, mSharedLibraries		final Map<String, ReconciledPackage> reconcileResult =
	.getSharedLibLatestVersionSetting(scanResult))),		ReconcilePackageUtils.reconcilePackages(reconcileRequest,
	mPm.mSettings.getKeySetManagerService(), mPm.mInjector);		mPm.mSettings.getKeySetManagerService(), mPm.mInjector);
	appIdCreated = optimisticallyRegisterAppId(scanResult);		appIdCreated = optimisticallyRegisterAppId(scanResult);
	commitReconciledScanResultLocked(		commitReconciledScanResultLocked(reconcileResult.get(pkgName),
	reconcileResult.get(pkgName), mPm.mUserManager.getUserIds());		mPm.mUserManager.getUserIds());
	} catch (PackageManagerException e) {		} catch (PackageManagerException e) {
	if (appIdCreated) {		if (appIdCreated) {
	cleanUpAppIdCreation(scanResult);		cleanUpAppIdCreation(scanResult);

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -381,7 +381,7 @@ public final class SharedLibrariesImpl implements SharedLibrariesRead, Watchable
	* @return The package setting that represents the latest version of shared library info.		* @return The package setting that represents the latest version of shared library info.
	*/		*/
	@Nullable		@Nullable
	PackageSetting getSharedLibLatestVersionSetting(@NonNull ScanResult scanResult) {		PackageSetting getStaticSharedLibLatestVersionSetting(@NonNull ScanResult scanResult) {
	PackageSetting sharedLibPackage = null;		PackageSetting sharedLibPackage = null;
	synchronized (mPm.mLock) {		synchronized (mPm.mLock) {
	final SharedLibraryInfo latestSharedLibraVersionLPr =		final SharedLibraryInfo latestSharedLibraVersionLPr =