diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-01-07 00:58:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 00:58:04 +0000 |
| commit | 5c72de4cee0f264fd4b4bb04c9e64c8dd47687ac (patch) | |
| tree | 62ecd93b0d3b7e45a29d863522eeb8c201e0f472 /core/java/android/app | |
| parent | cabe15ac76dcf72bfa9f0860d00e214b162b14e9 (diff) | |
| parent | 442dcb1761f5f200c12c3f86409f780fbcf20e51 (diff) | |
| download | frameworks_base-5c72de4cee0f264fd4b4bb04c9e64c8dd47687ac.zip frameworks_base-5c72de4cee0f264fd4b4bb04c9e64c8dd47687ac.tar.gz frameworks_base-5c72de4cee0f264fd4b4bb04c9e64c8dd47687ac.tar.bz2 | |
am 442dcb17: am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"
* commit '442dcb1761f5f200c12c3f86409f780fbcf20e51':
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; |