Merge "Fixed a crash with remote input" into qt-r1-dev

am: 7c33cbcbcc Change-Id: Id95e297df37d1fda9f1c7a580343a8fbc9f6ef2b
2019-07-12 19:27:02 -07:00
parent bec00711f9 7c33cbcbcc
commit a038e98285
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
@@ -398,7 +398,7 @@ public class NotificationRemoteInputManager implements Dumpable {
            }
        }

-        if (!riv.isAttachedToWindow()) {
+        if (riv != null && !riv.isAttachedToWindow()) {
            // the remoteInput isn't attached to the window anymore :/ Let's focus on the expanded
            // one instead if it's available
            riv = null;