Merge "Fix issue with PiP callbacks not being handled" am: bdd8adb006 (3b38be29) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java

+4 −12

Original line number	Diff line number	Diff line
		@@ -619,9 +619,7 @@ public class PipManager implements BasePipManager {
		@Override
		public void onTaskStackChanged() {
		if (DEBUG) Log.d(TAG, "onTaskStackChanged()");
		if (!checkCurrentUserId(mContext, DEBUG)) {
		return;
		}

		if (getState() != STATE_NO_PIP) {
		boolean hasPip = false;

		@@ -656,9 +654,7 @@ public class PipManager implements BasePipManager {
		@Override
		public void onActivityPinned(String packageName, int userId, int taskId) {
		if (DEBUG) Log.d(TAG, "onActivityPinned()");
		if (!checkCurrentUserId(mContext, DEBUG)) {
		return;
		}

		StackInfo stackInfo = getPinnedStackInfo();
		if (stackInfo == null) {
		Log.w(TAG, "Cannot find pinned stack");
		@@ -683,9 +679,7 @@ public class PipManager implements BasePipManager {
		@Override
		public void onPinnedActivityRestartAttempt(boolean clearedTask) {
		if (DEBUG) Log.d(TAG, "onPinnedActivityRestartAttempt()");
		if (!checkCurrentUserId(mContext, DEBUG)) {
		return;
		}

		// If PIPed activity is launched again by Launcher or intent, make it fullscreen.
		movePipToFullscreen();
		}
		@@ -693,9 +687,7 @@ public class PipManager implements BasePipManager {
		@Override
		public void onPinnedStackAnimationEnded() {
		if (DEBUG) Log.d(TAG, "onPinnedStackAnimationEnded()");
		if (!checkCurrentUserId(mContext, DEBUG)) {
		return;
		}

		switch (getState()) {
		case STATE_PIP_MENU:
		showPipMenu();