Merge "Update ProcessRecord ApplicationInfo for RROs" into rvc-dev am: e1adc126a4 am: 55667c98cb (caefff6b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ProcessList.java

+15 −10

Original line number	Diff line number	Diff line
		@@ -3639,12 +3639,18 @@ public final class ProcessList {
		final int packageCount = app.pkgList.size();
		for (int j = 0; j < packageCount; j++) {
		final String packageName = app.pkgList.keyAt(j);
		if (updateFrameworkRes \|\| packagesToUpdate.contains(packageName)) {
		if (!updateFrameworkRes && !packagesToUpdate.contains(packageName)) {
		continue;
		}
		try {
		final ApplicationInfo ai = AppGlobals.getPackageManager()
		.getApplicationInfo(packageName, STOCK_PM_FLAGS, app.userId);
		if (ai != null) {
		if (ai == null) {
		continue;
		}
		app.thread.scheduleApplicationInfoChanged(ai);
		if (ai.packageName.equals(app.info.packageName)) {
		app.info = ai;
		}
		} catch (RemoteException e) {
		Slog.w(TAG, String.format("Failed to update %s ApplicationInfo for %s",
		@@ -3653,7 +3659,6 @@ public final class ProcessList {
		}
		}
		}
		}

		@GuardedBy("mService")
		void sendPackageBroadcastLocked(int cmd, String[] packages, int userId) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ class ProcessRecord implements WindowProcessListener {
		private static final String TAG = TAG_WITH_CLASS_NAME ? "ProcessRecord" : TAG_AM;

		private final ActivityManagerService mService; // where we came from
		final ApplicationInfo info; // all about the first app in the process
		volatile ApplicationInfo info; // all about the first app in the process
		final ProcessInfo processInfo; // if non-null, process-specific manifest info
		final boolean isolated; // true if this is a special isolated process
		final boolean appZygote; // true if this is forked from the app zygote