Merge "Check for PIPable activities after moving task to back." into rvc-dev (144ba122) · Commits · e / os / android_frameworks_base

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -4620,7 +4620,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// the current contract for "auto-Pip" is that the app should enter it before onPause
		// returns. Just need to confirm this reasoning makes sense.
		final boolean deferHidingClient = canEnterPictureInPicture
		&& !isState(STOPPING, STOPPED, PAUSED);
		&& !isState(STARTED, STOPPING, STOPPED, PAUSED);
		setDeferHidingClient(deferHidingClient);
		setVisibility(false);

		@@ -4631,9 +4631,16 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// activity is hidden
		supportsEnterPipOnTaskSwitch = false;
		break;

		case INITIALIZING:
		case RESUMED:
		// 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 */);
		break;
		}
		case INITIALIZING:
		case PAUSING:
		case PAUSED:
		case STARTED:

+2 −2

Original line number	Diff line number	Diff line
		@@ -2676,9 +2676,9 @@ class ActivityStack extends Task {
		mRootWindowContainer.ensureVisibilityAndConfig(null /* starting */,
		getDisplay().mDisplayId, false /* markFrozenIfConfigChanged */,
		false /* deferResume */);
		}

		} else {
		mRootWindowContainer.resumeFocusedStacksTopActivities();
		}
		return true;
		}