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

Commit 6911cccd authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

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

parents 103b84b2 dc02781b

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

+8 −1
Original line number Diff line number Diff line
@@ -803,8 +803,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 {