diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-01-07 00:05:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-07 00:05:11 +0000 |
| commit | dcf323adaf3d59fb720dc534380090f9df3a618c (patch) | |
| tree | 2efa28570f145f39fd16e2c89f48d302a978ab05 /core/java/android/app | |
| parent | a15d6402cf4f99e448c7aaa69553483cdb18e0d4 (diff) | |
| parent | eb7b408ac76558b8673b5a3f4cc4c56ce54cb5e7 (diff) | |
| download | frameworks_base-dcf323adaf3d59fb720dc534380090f9df3a618c.zip frameworks_base-dcf323adaf3d59fb720dc534380090f9df3a618c.tar.gz frameworks_base-dcf323adaf3d59fb720dc534380090f9df3a618c.tar.bz2 | |
Merge "NPE in SearchManager.triggerSearch"
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/SearchManager.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index a40b29a..d7c4467 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -540,11 +540,6 @@ public class SearchManager private final Context mContext; - /** - * The package associated with this seach manager. - */ - private String mAssociatedPackage; - // package private since they are used by the inner class SearchManagerCallback /* package */ final Handler mHandler; /* package */ OnDismissListener mDismissListener = null; @@ -742,10 +737,6 @@ public class SearchManager public void triggerSearch(String query, ComponentName launchActivity, Bundle appSearchData) { - if (!mAssociatedPackage.equals(launchActivity.getPackageName())) { - throw new IllegalArgumentException("invoking app search on a different package " + - "not associated with this search manager"); - } if (query == null || TextUtils.getTrimmedLength(query) == 0) { Log.w(TAG, "triggerSearch called with empty query, ignoring."); return; |