Merge "Update application info for activity record when application info changed" into main (ac3be0cd) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -5146,6 +5146,7 @@ public final class ProcessList {
		if (ai != null) {
		if (ai.packageName.equals(app.info.packageName)) {
		app.info = ai;
		app.getWindowProcessController().updateApplicationInfo(ai);
		PlatformCompatCache.getInstance()
		.onApplicationInfoChanged(ai);
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
		private int mRapidActivityLaunchCount;

		// all about the first app in the process
		final ApplicationInfo mInfo;
		volatile ApplicationInfo mInfo;
		final String mName;
		final int mUid;

		@@ -1789,12 +1789,17 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
		Configuration overrideConfig = new Configuration(r.getRequestedOverrideConfiguration());
		overrideConfig.assetsSeq = assetSeq;
		r.onRequestedOverrideConfigurationChanged(overrideConfig);
		r.updateApplicationInfo(mInfo);
		if (r.isVisibleRequested()) {
		r.ensureActivityConfiguration();
		}
		}
		}

		public void updateApplicationInfo(ApplicationInfo aInfo) {
		mInfo = aInfo;
		}

		/**
		* This is called for sending {@link android.app.servertransaction.LaunchActivityItem}.
		* The caller must call {@link #setLastReportedConfiguration} if the delivered configuration