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

Commit c2a2c623 authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "Don't clear flags in startActivity" into ub-now-nova

parents 56924a82 b6cc40bc

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).