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

Commit 9d347fe0 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Fix NPR in RemoteInputController 

Fix: 412608682
Test: manual, send remote reply in Gmail and verify it doesn't crash
Flag: EXEMPT small bugfix
Change-Id: I2237de5618c172575382ce7d7353ae2f688448fd
parent 236a3c6f

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) {