Snap for 8599125 from d837d55a3d4a0362af9df0b1d95b42b271bf04e8 to tm-qpr1-release (6ae860dd) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityClient.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,15 @@ public class ActivityClient {
		}
		}

		/** Reports the activity starts local relaunch. */
		public void activityLocalRelaunch(IBinder token) {
		try {
		getActivityClientController().activityLocalRelaunch(token);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}
		}

		/** Reports the activity has completed relaunched. */
		public void activityRelaunched(IBinder token) {
		try {

core/java/android/app/ActivityManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -2210,7 +2210,6 @@ public class ActivityManager {
		pw.print(((baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0));
		pw.print(" activityType="); pw.print(activityTypeToString(getActivityType()));
		pw.print(" windowingMode="); pw.print(windowingModeToString(getWindowingMode()));
		pw.print(" supportsSplitScreenMultiWindow="); pw.print(supportsSplitScreenMultiWindow);
		pw.print(" supportsMultiWindow=");
		pw.println(supportsMultiWindow);
		if (taskDescription != null) {

core/java/android/app/ActivityThread.java

+1 −30

Original line number	Diff line number	Diff line
		@@ -3410,26 +3410,12 @@ public final class ActivityThread extends ClientTransactionHandler
		}
		}

		/**
		* Returns {@code true} if the {@link android.app.ActivityManager.ProcessState} of the current
		* process is cached.
		*/
		@Override
		@VisibleForTesting
		public boolean isCachedProcessState() {
		synchronized (mAppThread) {
		return mLastProcessState >= ActivityManager.PROCESS_STATE_CACHED_ACTIVITY;
		}
		}

		@Override
		public void updateProcessState(int processState, boolean fromIpc) {
		final boolean wasCached;
		synchronized (mAppThread) {
		if (mLastProcessState == processState) {
		return;
		}
		wasCached = isCachedProcessState();
		mLastProcessState = processState;
		// Defer the top state for VM to avoid aggressive JIT compilation affecting activity
		// launch time.
		@@ -3446,22 +3432,6 @@ public final class ActivityThread extends ClientTransactionHandler
		+ (fromIpc ? " (from ipc" : ""));
		}
		}

		// Handle the pending configuration if the process state is changed from cached to
		// non-cached. Except the case where there is a launching activity because the
		// LaunchActivityItem will handle it.
		if (wasCached && !isCachedProcessState() && mNumLaunchingActivities.get() == 0) {
		final Configuration pendingConfig =
		mConfigurationController.getPendingConfiguration(false /* clearPending */);
		if (pendingConfig == null) {
		return;
		}
		if (Looper.myLooper() == mH.getLooper()) {
		handleConfigurationChanged(pendingConfig);
		} else {
		sendMessage(H.CONFIGURATION_CHANGED, pendingConfig);
		}
		}
		}

		/** Update VM state based on ActivityManager.PROCESS_STATE_* constants. */
		@@ -5728,6 +5698,7 @@ public final class ActivityThread extends ClientTransactionHandler
		return;
		}

		ActivityClient.getInstance().activityLocalRelaunch(r.token);
		// Initialize a relaunch request.
		final MergedConfiguration mergedConfiguration = new MergedConfiguration(
		r.createdConfig != null

core/java/android/app/ActivityThreadInternal.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ interface ActivityThreadInternal {

		boolean isInDensityCompatMode();

		boolean isCachedProcessState();

		Application getApplication();

		ArrayList<ComponentCallbacks2> collectComponentCallbacks(boolean includeUiContexts);

core/java/android/app/ConfigurationController.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -124,12 +124,6 @@ class ConfigurationController {
		* @param config The new configuration.
		*/
		void handleConfigurationChanged(@NonNull Configuration config) {
		if (mActivityThread.isCachedProcessState()) {
		updatePendingConfiguration(config);
		// If the process is in a cached state, delay the handling until the process is no
		// longer cached.
		return;
		}
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "configChanged");
		handleConfigurationChanged(config, null /* compat */);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);