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

Commit b6cc40bc authored by Kenny Guy's avatar Kenny Guy
Browse files

Don't clear flags in startActivity 

Move setting flags for starting apps back to
AppInfo from Launcher.startActivity.

Bug: 14839470
Change-Id: I1dc928e9ebce9ce4d411678f94b5ca4284c1255f
parent 418dcb88

src/com/android/launcher3/AppInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ public class AppInfo extends ItemInfo { 
        intent = new Intent(Intent.ACTION_MAIN);

        intent.addCategory(Intent.CATEGORY_LAUNCHER);

        intent.setComponent(info.getComponentName());

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);

        long serialNumber = UserManagerCompat.getInstance(context).getSerialNumberForUser(user);

        intent.putExtra(EXTRA_PROFILE, serialNumber);

        this.user = user;

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -2629,7 +2629,7 @@ public class Launcher extends Activity 
    }



    boolean startActivity(View v, Intent intent, Object tag) {

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        try {

            // Only launch using the new animation if the shortcut has not opted out (this is a

            // private contract between launcher and may be ignored in the future).