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

Commit a51eb0bb authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 50576fa8: merge from open-source master 

Merge commit '50576fa8'

* commit '50576fa8':
  Start app with several activities with intent filter [Main, Launcher] was broken
parents 738afc5c 50576fa8

core/java/android/app/ContextImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -1715,8 +1715,9 @@ class ContextImpl extends Context { 
            if (resolveInfo == null) {

                return null;

            }

            Intent intent = new Intent(Intent.ACTION_MAIN);

            intent.setClassName(packageName, resolveInfo.activityInfo.name);

            Intent intent = new Intent(intentToResolve);

            intent.setClassName(resolveInfo.activityInfo.applicationInfo.packageName,

                                resolveInfo.activityInfo.name);

            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            return intent;

        }