Merge "Fix an NPE in SearchDialog when clicking on Mic button. Bug: 2410605"

1 files changed, 6 insertions, 7 deletions

diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index 3dfbe7184f90..ec9f3b4fc56d 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -903,15 +903,14 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
             if (mSearchable == null) {
                 return;
             }
+            SearchableInfo searchable = mSearchable;
+            // First stop the existing search before starting voice search, or else we'll end
+            // up showing the search dialog again once we return to the app.
+            cancel();
             try {
-                // First stop the existing search before starting voice search, or else we'll end
-                // up showing the search dialog again once we return to the app.
-                ((SearchManager) getContext().getSystemService(Context.SEARCH_SERVICE)).
-                        stopSearch();
-                
-                if (mSearchable.getVoiceSearchLaunchWebSearch()) {
+                if (searchable.getVoiceSearchLaunchWebSearch()) {
                     getContext().startActivity(mVoiceWebSearchIntent);
-                } else if (mSearchable.getVoiceSearchLaunchRecognizer()) {
+                } else if (searchable.getVoiceSearchLaunchRecognizer()) {
                     Intent appSearchIntent = createVoiceAppSearchIntent(mVoiceAppSearchIntent);                    
                     getContext().startActivity(appSearchIntent);
                 }