Merge "Restore the behavior of adding a RESUMED activity to stopping list" (018a02f8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -4770,14 +4770,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		supportsEnterPipOnTaskSwitch = false;
		break;
		case RESUMED:
		// Do nothing if currently in the process of resuming the activity. Otherwise,
		// starting to pause it since it is not visible.
		if (!mSetToSleep) {
		// If the app is capable of entering PIP, we should try pausing it now
		// so it can PIP correctly.
		if (deferHidingClient) {
		getRootTask().startPausingLocked(
		mStackSupervisor.mUserLeaving /* userLeaving */,
		false /* uiSleeping /, null / resuming */, "makeInvisible");
		break;
		}
		getRootTask().startPausingLocked(mStackSupervisor.mUserLeaving,
		false /* uiSleeping /, null / resuming */, "makeInvisible");
		// fall through
		case INITIALIZING:
		case PAUSING:
		case PAUSED: