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

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

Merge "For managed profiles, use the parent user's default launcher"

parents b69feaff 22b80523

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

+3 −2
Original line number Diff line number Diff line
@@ -2739,7 +2739,8 @@ public class ShortcutService extends IShortcutService.Stub { 


                // Default launcher from role manager.

                final long startGetHomeRoleHoldersAsUser = getStatStartTime();

                final String defaultLauncher = injectGetHomeRoleHolderAsUser(userId);

                final String defaultLauncher = injectGetHomeRoleHolderAsUser(

                        getParentOrSelfUserId(userId));

                logDurationStat(Stats.GET_DEFAULT_HOME, startGetHomeRoleHoldersAsUser);



                if (defaultLauncher != null) {
@@ -4694,7 +4695,7 @@ public class ShortcutService extends IShortcutService.Stub { 
                final List<ResolveInfo> allHomeCandidates = new ArrayList<>();

                // Default launcher from package manager.

                final ComponentName defaultLauncher = mPackageManagerInternal

                        .getHomeActivitiesAsUser(allHomeCandidates, mUserId);

                        .getHomeActivitiesAsUser(allHomeCandidates, getParentOrSelfUserId(mUserId));

                getOutPrintWriter().println("Launcher: " + defaultLauncher);

            }

        }