From 19734232cb93e0a254b27bda79cc6e56c5e45eb3 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Thu, 11 Jul 2019 20:02:40 -0700
Subject: [PATCH] Fixed a crash with remote input

Fixes: 137156529
Test: use remote input on hun
Change-Id: Ib1adc090346d7a90283053725e0038494b326528
---
 .../systemui/statusbar/NotificationRemoteInputManager.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
index 70ee752dd8eda..c9050d4921915 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 @@ 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;