Merge "Fix the flicker when entering PiP from Recents" into tm-qpr-dev am: 9e732e644e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20889974

Change-Id: I30a8cf545971f6002dd0a0bfd0787e755f83aef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2023-01-09 20:50:45 +00:00
committed by Automerger Merge Worker

View File

@@ -814,7 +814,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb
@Override @Override
public void onKeyguardVisibilityChanged(boolean visible, boolean occluded, public void onKeyguardVisibilityChanged(boolean visible, boolean occluded,
boolean animatingDismiss) { boolean animatingDismiss) {
if (!mPipTaskOrganizer.isInPip()) { if (!mPipTransitionState.hasEnteredPip()) {
return; return;
} }
if (visible) { if (visible) {