From 92d0dda3dc9fe46033ef4dfa470633dee1da4528 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <>
Date: Tue, 24 Mar 2009 18:30:18 -0700
Subject: [PATCH] Automated import from //branches/cupcake/...@141843,141843

---
 src/com/android/launcher/Launcher.java         | 3 ++-
 src/com/android/launcher/LauncherProvider.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index d84e67da74..d64669b2ac 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -412,7 +412,8 @@ public final class Launcher extends Activity implements View.OnClickListener, On
                     intent.putExtra(Contacts.Intents.UI.FILTER_TEXT_EXTRA_KEY, str);
                 }
 
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                        | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
 
                 try {
                     startActivity(intent);
diff --git a/src/com/android/launcher/LauncherProvider.java b/src/com/android/launcher/LauncherProvider.java
index 21ef1e0f19..e63ef3084f 100644
--- a/src/com/android/launcher/LauncherProvider.java
+++ b/src/com/android/launcher/LauncherProvider.java
@@ -505,7 +505,8 @@ public class LauncherProvider extends ContentProvider {
                 ComponentName cn = new ComponentName(packageName, className);
                 info = packageManager.getActivityInfo(cn, 0);
                 intent.setComponent(cn);
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                        | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
                 values.put(Favorites.INTENT, intent.toURI());
                 values.put(Favorites.TITLE, info.loadLabel(packageManager).toString());
                 values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_APPLICATION);