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

Commit 4a3fda9e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Break infinite recursion in RemoteInputView" into tm-dev am: 4e08c381 

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



Change-Id: I82dbc2b57271866099f1f21f0ba3a6a453a57b5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6b51eb6 4e08c381

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

+6 −3
Original line number Diff line number Diff line
@@ -114,15 +114,18 @@ public class RemoteInputController { 
    public void addRemoteInput(NotificationEntry entry, Object token) {

        Objects.requireNonNull(entry);

        Objects.requireNonNull(token);



        boolean isActive = isRemoteInputActive(entry);

        boolean found = pruneWeakThenRemoveAndContains(

                entry /* contains */, null /* remove */, token /* removeToken */);

        if (!found) {

            mOpen.add(new Pair<>(new WeakReference<>(entry), token));

        }



        // If the remote input focus is being transferred between different notification layouts

        // (ex: Expanded->Contracted), then we don't want to re-apply.

        if (!isActive) {

            apply(entry);

        }

    }



    /**

     * Removes a currently active remote input.