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

Commit 9080ceaa 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: 6911cccd 

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



Change-Id: I1034adc0b3ac0d0a235a7b6f3ae7c29d56fcbc60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c790767e 6911cccd

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 {