commit 6361854227f91321a341d5ee68a01d46020bf3c9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 23 20:00:25 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 23 20:00:25 2019 +0000
tree 0cbef7e4af6a44952a47d530802566caeab6567e
parent 764ba4bd4285a04b5d83849d30fd3d634bb3133a
parent 3acedf287edaf61e94066a9498071e2bcefb92c7

Merge "Guard against null when wrapping input connection."

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index 7b4a7d2..502a9bd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -679,8 +679,8 @@
                         }
                     };
 
-            InputConnection ic = InputConnectionCompat.createWrapper(
-                    inputConnection, outAttrs, callback);
+            InputConnection ic = inputConnection == null ? null :
+                    InputConnectionCompat.createWrapper(inputConnection, outAttrs, callback);
 
             Context userContext = null;
             try {