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

Commit 807ad517 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE when checking focused stage before root task is ready" into... 

Merge "Prevent NPE when checking focused stage before root task is ready" into sc-v2-dev am: f64f48c5 am: 8b3210fa

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

Change-Id: I765d8bb5695b685c2ca164fe757c376be9ed1a93
parents 8b5d5fa8 8b3210fa

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java

+12 −2
Original line number Diff line number Diff line
@@ -113,10 +113,20 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 


    /** @return {@code true} if this listener contains the currently focused task. */

    boolean isFocused() {

        if (mRootTaskInfo.isFocused) return true;

        if (mRootTaskInfo == null) {

            return false;

        }



        if (mRootTaskInfo.isFocused) {

            return true;

        }



        for (int i = mChildrenTaskInfo.size() - 1; i >= 0; --i) {

            if (mChildrenTaskInfo.valueAt(i).isFocused) return true;

            if (mChildrenTaskInfo.valueAt(i).isFocused) {

                return true;

            }

        }



        return false;

    }