commit 9e732e644e02e32392951097e156f1857b2ce2df
author Hongwei Wang <hwwang@google.com> Mon Jan 09 20:20:20 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 09 20:20:20 2023 +0000
tree b7a687f4806ed15a9ace893e95bdc10753d60c77
parent 523afd2f272727a1af558a82619098b2853b5af8
parent 76ab1b4df330cc9eda53ff1466f03d68abd648f9

Merge "Fix the flicker when entering PiP from Recents" into tm-qpr-dev

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
index 01d81ff..3153313 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
@@ -814,7 +814,7 @@
     @Override
     public void onKeyguardVisibilityChanged(boolean visible, boolean occluded,
             boolean animatingDismiss) {
-        if (!mPipTaskOrganizer.isInPip()) {
+        if (!mPipTransitionState.hasEnteredPip()) {
             return;
         }
         if (visible) {