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

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

+12 −10

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

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

	@@ -5702,6 +5703,7 @@ public class PackageManagerService extends IPackageManager.Stub {
	}		}
	}		}
	}		}
			}

	return true;		return true;
	}		}