am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService." (82ec8c58) · Commits · e / os / android_frameworks_base

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

+12 −10

Original line number	Diff line number	Diff line
		@@ -5721,6 +5721,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		}

		ps.cpuAbiString = adjustedAbi;
		if (ps.pkg != null && ps.pkg.applicationInfo != null) {
		ps.pkg.applicationInfo.cpuAbi = adjustedAbi;
		Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + adjustedAbi);

		@@ -5734,6 +5735,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		}
		}
		}

		return true;
		}