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

Commit 8bcc7517 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPR in RemoteInputController" into main

parents 304e8072 9d347fe0

packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java

+2 −1
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ public class RemoteInputController { 
            Object itemToken = mOpen.get(i).second;

            boolean removeTokenMatches = (removeToken == null || itemToken == removeToken);



            if (item == null || (item.isSameEntryAs(remove) && removeTokenMatches)) {

            if (item == null

                    || (remove != null && item.isSameEntryAs(remove) && removeTokenMatches)) {

                mOpen.remove(i);

            } else if (item.isSameEntryAs(contains)) {

                if (removeToken != null && removeToken != itemToken) {