commit a038e982851a9064a15429ca5aa24258992f658a
author Selim Cinek <cinek@google.com> Fri Jul 12 19:27:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 12 19:27:02 2019 -0700
tree ec205cdf526874fccc21f9e60fac86050e3ae52f
parent bec00711f9c8a9e86b6bd082a8b378588d9c099f
parent 7c33cbcbcc9e12a130ca62c52607cc88fec2ec9c

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

Change-Id: Id95e297df37d1fda9f1c7a580343a8fbc9f6ef2b

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;