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

Commit 087c0603 authored by Evan Millar's avatar Evan Millar Committed by Android Git Automerger
Browse files

am 2b3970a2: Merge change Idc1396c8 into eclair 

Merge commit '2b3970a2' into eclair-mr2

* commit '2b3970a2':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
parents 811f6553 2b3970a2

core/java/android/app/SearchDialog.java

+5 −2
Original line number Diff line number Diff line
@@ -1646,8 +1646,11 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        Intent intent = new Intent(action);

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        // We need CLEAR_TOP to avoid reusing an old task that has other activities

        // on top of the one we want.

        // on top of the one we want. We don't want to do this in in-app search though,

        // as it can be destructive to the activity stack.

        if (mGlobalSearchMode) {

            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);

        }

        if (data != null) {

            intent.setData(data);

        }