Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fff89ca2 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 7e71fb28: Merge change 8111 into donut 

Merge commit '7e71fb28'

* commit '7e71fb28':
  Don't start search from a dialog if there is no activity associated with
parents 078bc317 7e71fb28

core/java/android/app/Dialog.java

+5 −0
Original line number Diff line number Diff line
@@ -788,6 +788,11 @@ public class Dialog implements DialogInterface, Window.Callback, 
        final SearchManager searchManager = (SearchManager) mContext

                .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

        // global search).

        final ComponentName appName = mOwnerActivity == null ? null

core/java/android/app/SearchManager.java

+4 −0
Original line number Diff line number Diff line
@@ -1537,6 +1537,10 @@ public class SearchManager 
                ServiceManager.getService(Context.SEARCH_SERVICE));

    }



    /*package*/ boolean hasIdent() {

        return mIdent != 0;

    }

    

    /*package*/ void setIdent(int ident) {

        if (mIdent != 0) {

            throw new IllegalStateException("mIdent already set");