commit 72dd8534e4fa33b7c0bff02082f869a499ead698
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 15 17:28:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 15 17:28:37 2020 +0000
tree 2ef66b3aecd01a3b38f80ec73b2a7d9cabf470a4
parent e8764ae4ac85b9102868db4e57035ec08865e5b1
parent e68c1cdc5b10c37b4d2e3549d422aedad8c7abbe

Merge "Scrolling search results and autorotate cause crash" am: d1a2bef27a am: e68c1cdc5b

Change-Id: I35815ebb9c03d91777dc63416ad2c339585b6558

src/com/android/settings/intelligence/search/SearchFragment.java

diff --git a/src/com/android/settings/intelligence/search/SearchFragment.java b/src/com/android/settings/intelligence/search/SearchFragment.java
index 4642b16..c76eda3 100644
--- a/src/com/android/settings/intelligence/search/SearchFragment.java
+++ b/src/com/android/settings/intelligence/search/SearchFragment.java
@@ -344,9 +344,11 @@
         final Activity activity = getActivity();
         if (activity != null) {
             View view = activity.getCurrentFocus();
-            InputMethodManager imm = (InputMethodManager)
-                    activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+            if (view != null) {
+                InputMethodManager imm = (InputMethodManager)
+                        activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+            }
         }
 
         if (mResultsRecyclerView != null) {