commit 701071bb0fdc87de17f9306e5e118d8b077d725a
author Adam Cohen <adamcohen@google.com> Mon Dec 08 19:11:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 08 19:11:35 2014 +0000
tree a49fa519b1d0e93c21e2979bed2324f949604b87
parent 63f8a2f73cebdd757914a7e0fcb874cc3e965708
parent 9d0b4e6b950289334d2b75bdef7dd2dac98cdd8d

am 9d0b4e6b: am 3b5f5f28: Fix regression wherein correct activity flags weren\'t being set

* commit '9d0b4e6b950289334d2b75bdef7dd2dac98cdd8d':
  Fix regression wherein correct activity flags weren't being set

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);
     }