commit 507eab39e1e6ffe0e02d17b764d2322549153bff
author Selim Cinek <cinek@google.com> Fri Jul 12 19:46:40 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 12 19:46:40 2019 -0700
tree 15c0e6689c9fcc96ae241863ab40611467c7542f
parent 4e316581edeb18ecf20ee92cfa3958f2d73a0298
parent a038e982851a9064a15429ca5aa24258992f658a

Merge "Fixed a crash with remote input" into qt-r1-dev am: 7c33cbcbcc
am: a038e98285

Change-Id: I50752b51594943c343c181f3303490c0da09dd30

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
index 70ee752..c9050d4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
@@ -398,7 +398,7 @@
             }
         }
 
-        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;