Merge "PackageManagerService: Add more ABI adjustment logging" (1990221c) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -8092,9 +8092,15 @@ public class PackageManagerService extends IPackageManager.Stub {
		}

		ps.primaryCpuAbiString = adjustedAbi;
		if (ps.pkg != null && ps.pkg.applicationInfo != null) {
		if (ps.pkg != null && ps.pkg.applicationInfo != null &&
		!TextUtils.equals(adjustedAbi, ps.pkg.applicationInfo.primaryCpuAbi)) {
		ps.pkg.applicationInfo.primaryCpuAbi = adjustedAbi;
		Slog.i(TAG, "Adjusting ABI for " + ps.name + " to " + adjustedAbi);
		Slog.i(TAG, "Adjusting ABI for " + ps.name + " to " + adjustedAbi
		+ " (requirer="
		+ (requirer == null ? "null" : requirer.pkg.packageName)
		+ ", scannedPackage="
		+ (scannedPackage != null ? scannedPackage.packageName : "null")
		+ ")");
		try {
		mInstaller.rmdex(ps.codePathString,
		getDexCodeInstructionSet(getPreferredInstructionSet()));