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

Commit 358a8cc6 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Add null check to StackBox containment test."

parents ce127968 dc725fe9

services/java/com/android/server/wm/StackBox.java

+2 −2
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ public class StackBox { 
     * @return true if the specified StackBox matches this or one of its descendants.

     */

    boolean contains(int stackBoxId) {

        return mStackBoxId == stackBoxId || mFirst.contains(stackBoxId)

                || mSecond.contains(stackBoxId);

        return mStackBoxId == stackBoxId ||

                (mStack == null &&  (mFirst.contains(stackBoxId) || mSecond.contains(stackBoxId)));

    }



    /**