commit 4e92b07808f3f1d26042c5128532dd4a1051b00c
author The Android Automerger <android-build@google.com> Mon Dec 08 06:11:49 2014 -0800
committer The Android Automerger <android-build@google.com> Mon Dec 08 06:11:49 2014 -0800
tree a575470225703a7bd3cb98261480c532d5704e9e
parent 881267d6e1801f05affcb2bcd03627c9e3b8bf49
parent 91ddedf683afbab650f549cd0114fcc7068d7fab

merge in lmp-mr1-release history after reset to lmp-mr1-dev

src/com/android/launcher2/ApplicationInfo.java

diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/android/launcher2/ApplicationInfo.java
index b9a1e56..f81c3cb 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,8 @@
         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);
+        itemType = LauncherSettings.BaseLauncherColumns.ITEM_TYPE_APPLICATION;
         updateUser(intent);
     }
 
@@ -97,21 +97,6 @@
         firstInstallTime = info.firstInstallTime;
     }
 
-    /**
-     * Creates the application intent based on a component name and various launch flags.
-     * Sets {@link #itemType} to {@link LauncherSettings.BaseLauncherColumns#ITEM_TYPE_APPLICATION}.
-     *
-     * @param className the class name of the component representing the intent
-     * @param launchFlags the launch flags
-     */
-    final void setActivity(ComponentName className, int launchFlags) {
-        intent = new Intent(Intent.ACTION_MAIN);
-        intent.addCategory(Intent.CATEGORY_LAUNCHER);
-        intent.setComponent(className);
-        intent.setFlags(launchFlags);
-        itemType = LauncherSettings.BaseLauncherColumns.ITEM_TYPE_APPLICATION;
-    }
-
     @Override
     public String toString() {
         return "ApplicationInfo(title=" + title.toString() + " P=" + user + ")";