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

Commit 619538b7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Workaround a bug that causes multiple activity instances are created"

parents 1b41a2f9 12917c6b

services/core/java/com/android/server/pm/LauncherAppsService.java

+1 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ public class LauncherAppsService extends SystemService { 
                            activityInfo.name.equals(component.getClassName())) {

                        // Found an activity with category launcher that matches

                        // this component so ok to launch.

                        launchIntent.setPackage(null);

                        launchIntent.setComponent(component);

                        mContext.startActivityAsUser(launchIntent, opts, user);

                        return;

services/core/java/com/android/server/pm/crossprofile/CrossProfileAppsServiceImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public class CrossProfileAppsServiceImpl extends ICrossProfileApps.Stub { 


        final long ident = mInjector.clearCallingIdentity();

        try {

            launchIntent.setPackage(null);

            launchIntent.setComponent(component);

            mContext.startActivityAsUser(launchIntent,

                    ActivityOptions.makeOpenCrossProfileAppsAnimation().toBundle(), user);