Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bb91a46 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Work around for NPE with shell transition" into tm-qpr-dev am:... 

Merge "Work around for NPE with shell transition" into tm-qpr-dev am: 6911cccd am: 9080ceaa am: 05905d06 am: 27167c01

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



Change-Id: Id5e87cc3eda75a32153926735136a9c23e34fc95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd824179 27167c01

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

+8 −1
Original line number Diff line number Diff line
@@ -797,8 +797,15 @@ public class PipTransition extends PipTransitionController { 
            if (sourceHintRect == null) {

                // We use content overlay when there is no source rect hint to enter PiP use bounds

                // animation.

                // TODO(b/272819817): cleanup the null-check and extra logging.

                final boolean hasTopActivityInfo = taskInfo.topActivityInfo != null;

                if (!hasTopActivityInfo) {

                    ProtoLog.w(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,

                            "%s: TaskInfo.topActivityInfo is null", TAG);

                }

                if (SystemProperties.getBoolean(

                        "persist.wm.debug.enable_pip_app_icon_overlay", true)) {

                        "persist.wm.debug.enable_pip_app_icon_overlay", true)

                        && hasTopActivityInfo) {

                    animator.setAppIconContentOverlay(

                            mContext, currentBounds, taskInfo.topActivityInfo);

                } else {