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

Commit c3d7fa13 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when setting icon overlay in PipTaskOrganizer" into udc-dev am: 754fb0b4 

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



Change-Id: I2da74287245bb922777c791e5255e8bdecad9cbc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b925697e 754fb0b4

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

+10 −1
Original line number Diff line number Diff line
@@ -1690,8 +1690,17 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            // Similar to auto-enter-pip transition, we use content overlay when there is no

            // source rect hint to enter PiP use bounds animation.

            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 = mTaskInfo.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, mTaskInfo.topActivityInfo,

                            mPipBoundsState.getLauncherState().getAppIconSizePx());