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

Merge change 8111 into donut

Browse Source 
* changes:
  Don't start search from a dialog if there is no activity associated with the search manager at that point.
This commit is contained in:
Android (Google) Code Review
2009-07-21 16:41:41 -07:00
parent 43f8d2e58c ec0a12cf19
commit 7e71fb284d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/Dialog.java
View File

@@ -788,6 +788,11 @@ public class Dialog implements DialogInterface, Window.Callback,
final SearchManager searchManager = (SearchManager) mContext final SearchManager searchManager = (SearchManager) mContext
.getSystemService(Context.SEARCH_SERVICE); .getSystemService(Context.SEARCH_SERVICE);
// can't start search without an associated activity (e.g a system dialog)
if (!searchManager.hasIdent()) {
return false;
}
// associate search with owner activity if possible (otherwise it will default to // associate search with owner activity if possible (otherwise it will default to
// global search). // global search).
final ComponentName appName = mOwnerActivity == null ? null final ComponentName appName = mOwnerActivity == null ? null

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

@@ -1537,6 +1537,10 @@ public class SearchManager
ServiceManager.getService(Context.SEARCH_SERVICE)); ServiceManager.getService(Context.SEARCH_SERVICE));
} }
/*package*/ boolean hasIdent() {
return mIdent != 0;
}
/*package*/ void setIdent(int ident) { /*package*/ void setIdent(int ident) {
if (mIdent != 0) { if (mIdent != 0) {
throw new IllegalStateException("mIdent already set"); throw new IllegalStateException("mIdent already set");