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

Commit 10ceaf9d authored by Ricky Wai's avatar Ricky Wai
Browse files

Return null when profile is not accessible in launcher api 

Test: atest com.android.cts.devicepolicy.LauncherAppsProfileTest#testGetActivitiesWithProfile
Bug: 122264345
Change-Id: I25955fe3e602123c5f8fcb5a43305a1c2dd03bb5
parent d47259a2

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -313,6 +313,10 @@ public class LauncherAppsService extends SystemService { 
                    Settings.Global.SHOW_HIDDEN_LAUNCHER_ICON_APPS_ENABLED, 1) == 0) {

                    Settings.Global.SHOW_HIDDEN_LAUNCHER_ICON_APPS_ENABLED, 1) == 0) {

                return launcherActivities;

                return launcherActivities;

            }

            }

            if (launcherActivities == null) {

                // Cannot access profile, so we don't even return any hidden apps.

                return null;

            }





            final int callingUid = injectBinderCallingUid();

            final int callingUid = injectBinderCallingUid();

            final ArrayList<ResolveInfo> result = new ArrayList<>(launcherActivities.getList());

            final ArrayList<ResolveInfo> result = new ArrayList<>(launcherActivities.getList());