Don't start global search from system dialogs

Also, set FLAG_ACTIVITY_NEW_TASK to allow launching
global search from non-activity contexts.

Fixes http://b/issue?id=2460991

Change-Id: I833d5b851f0127fb69165fbfc7d1ee190b320401

1 files changed, 8 insertions, 6 deletions

diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 4598bb562ff6..0ed5eb8a1f9f 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -822,13 +822,15 @@ public class Dialog implements DialogInterface, Window.Callback,
         final SearchManager searchManager = (SearchManager) mContext
                 .getSystemService(Context.SEARCH_SERVICE);
 
-        // associate search with owner activity if possible (otherwise it will default to
-        // global search).
+        // associate search with owner activity
         final ComponentName appName = getAssociatedActivity();
-        final boolean globalSearch = (appName == null);
-        searchManager.startSearch(null, false, appName, null, globalSearch);
-        dismiss();
-        return true;
+        if (appName != null) {
+            searchManager.startSearch(null, false, appName, null, false);
+            dismiss();
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**