commit 88a2f343c4d1882e8770adc5c1c4a560915100f3
author Michael Bestas <mkbestas@gmail.com> Wed Jun 12 15:26:09 2024 +0300
committer Tim Zimmermann <tim@linux4.de> Sat Jun 15 21:23:37 2024 +0200
tree cbe42c29f63321664499f7af11a0bf147a3b2486
parent ec079f96d44e60b5d4b81baac7f0c6ec6225a90f

Revert "Work around the flicker on enter PiP for foldables"

Reason for revert: Not present in QPR3.

This reverts commit fdaa880fd202aeebbad44c4f95cf89b0581ac473.

Change-Id: I659608446a8607047939a572adbdcaa8610a761e

libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java
index 4aed7c4..e6d35e8 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java
@@ -16,8 +16,6 @@
 
 package com.android.wm.shell.unfold;
 
-import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-
 import android.annotation.NonNull;
 import android.app.ActivityManager.RunningTaskInfo;
 import android.app.TaskInfo;
@@ -230,8 +228,7 @@
     }
 
     private void maybeResetTask(UnfoldTaskAnimator animator, TaskInfo taskInfo) {
-        // TODO(b/311084698): the windowing mode check is added here as a work around.
-        if (!mIsInStageChange || taskInfo.getWindowingMode() == WINDOWING_MODE_PINNED) {
+        if (!mIsInStageChange) {
             // No need to resetTask if there is no ongoing state change.
             return;
         }