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

am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"

Browse Source 
* commit '21735e222e0009b1ddcb080faa5b51117d0da879':
  NPE in SearchManager.triggerSearch
This commit is contained in:
Amith Yamasani
2015-01-07 00:17:09 +00:00
committed by Android Git Automerger
parent 641178f94f 21735e222e
commit 442dcb1761
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;
/**
* 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;