commit 3b5f5f28b27c6bcbcc5c43fe0b3f57d63e01323b
author Adam Cohen <adamcohen@google.com> Thu Dec 04 13:19:21 2014 -0800
committer Adam Cohen <adamcohen@google.com> Thu Dec 04 23:18:43 2014 +0000
tree ffe3ba798fff8c0c0090546ef5cc90fd772a3f89
parent 86d6a041466bd47ec57ba6b88f02b678462a5013

Fix regression wherein correct activity flags weren't being set

Bug 18580158

Change-Id: I793faa7b5c85977a75ce4bc591cde90643442bb7

src/com/android/launcher2/ApplicationInfo.java

diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/android/launcher2/ApplicationInfo.java
index b9a1e56..7b96ed8 100644
--- a/src/com/android/launcher2/ApplicationInfo.java
+++ b/src/com/android/launcher2/ApplicationInfo.java
@@ -69,8 +69,6 @@
 
         this.componentName = info.getComponentName();
         this.container = ItemInfo.NO_ID;
-        this.setActivity(componentName,
-                Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
 
         int appFlags = info.getApplicationInfo().flags;
         if ((appFlags & android.content.pm.ApplicationInfo.FLAG_SYSTEM) == 0) {
@@ -85,6 +83,7 @@
         intent.addCategory(Intent.CATEGORY_LAUNCHER);
         intent.setComponent(info.getComponentName());
         intent.putExtra(EXTRA_PROFILE, user);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
         updateUser(intent);
     }