Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NPE in SearchManager.triggerSearch"

Browse Source
This commit is contained in:
Amith Yamasani
2015-01-07 00:05:10 +00:00
committed by Gerrit Code Review
parent a15d6402cf eb7b408ac7
commit dcf323adaf
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/SearchManager.java
View File

@@ -540,11 +540,6 @@ public class SearchManager
private final Context mContext; 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 private since they are used by the inner class SearchManagerCallback
/* package */ final Handler mHandler; /* package */ final Handler mHandler;
/* package */ OnDismissListener mDismissListener = null; /* package */ OnDismissListener mDismissListener = null;
@@ -742,10 +737,6 @@ public class SearchManager
public void triggerSearch(String query, public void triggerSearch(String query,
ComponentName launchActivity, ComponentName launchActivity,
Bundle appSearchData) { 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) { if (query == null || TextUtils.getTrimmedLength(query) == 0) {
Log.w(TAG, "triggerSearch called with empty query, ignoring."); Log.w(TAG, "triggerSearch called with empty query, ignoring.");
return; return;