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

Commit eef5f6e3 authored by Nergi Rahardi's avatar Nergi Rahardi
Browse files

Fix DesktopModeWindowDecor crash due to stale task displayId 

Bug: 439721444
Test: atest CrossAppDragAndDropTests with ag/34807323
Flag: EXEMPT bugfix
Change-Id: If4e01e6c102d6bf5163f0320aac9f69d29729c7b
parent 365f625e

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import android.os.Handler; 
import android.os.Trace;

import android.os.UserHandle;

import android.util.Size;

import android.util.Slog;

import android.view.Choreographer;

import android.view.Display;

import android.view.InsetsState;
@@ -948,6 +949,11 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
    /** Update the view holder for app header. */

    private void updateAppHeaderViewHolder(boolean inFullImmersive, boolean hasGlobalFocus) {

        if (!isAppHeader(mWindowDecorViewHolder)) return;

        if (mDisplayController.getDisplayLayout(mTaskInfo.displayId) == null) {

            Slog.w(TAG, "Display" + mTaskInfo.displayId

                    + " is not found, task displayId might be stale");

            return;

        }

        asAppHeader(mWindowDecorViewHolder).bindData(new AppHeaderViewHolder.HeaderData(

                mTaskInfo,

                DesktopModeUtils.isTaskMaximized(mTaskInfo, mDisplayController),