Merge "Fix PackageManagerService passing usesLibraryFiles to dexOpt." into oc-dev (65263f96) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -16950,6 +16950,15 @@ public class PackageManagerService extends IPackageManager.Stub {
		return;
		}

		// Shared libraries for the package need to be updated.
		synchronized (mPackages) {
		try {
		updateSharedLibrariesLPr(pkg, null);
		} catch (PackageManagerException e) {
		Slog.e(TAG, "updateAllSharedLibrariesLPw failed: " + e.getMessage());
		}
		}

		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");
		// Do not run PackageDexOptimizer through the local performDexOpt
		// method because `pkg` may not be in `mPackages` yet.
		@@ -16998,6 +17007,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		args.user, installerPackageName, volumeUuid, res, args.installReason);
		}
		}

		synchronized (mPackages) {
		final PackageSetting ps = mSettings.mPackages.get(pkgName);
		if (ps != null) {