diff options
| author | 2019-01-14 10:39:40 +0000 | |
|---|---|---|
| committer | 2019-01-14 11:27:12 +0000 | |
| commit | 10ceaf9dbe792bb24d78cd36d6f6aad6a3c8e8d0 (patch) | |
| tree | 64ad500bfdd8cdaf8dbbbbc3c821f8276905a2da | |
| parent | d47259a203a4569ffaa88adf2449ee4beacbc856 (diff) | |
Return null when profile is not accessible in launcher api
Test: atest com.android.cts.devicepolicy.LauncherAppsProfileTest#testGetActivitiesWithProfile
Bug: 122264345
Change-Id: I25955fe3e602123c5f8fcb5a43305a1c2dd03bb5
| -rw-r--r-- | services/core/java/com/android/server/pm/LauncherAppsService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 7f1fb6c97e39..aa9bc2637fcc 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -313,6 +313,10 @@ public class LauncherAppsService extends SystemService { Settings.Global.SHOW_HIDDEN_LAUNCHER_ICON_APPS_ENABLED, 1) == 0) { return launcherActivities; } + if (launcherActivities == null) { + // Cannot access profile, so we don't even return any hidden apps. + return null; + } final int callingUid = injectBinderCallingUid(); final ArrayList<ResolveInfo> result = new ArrayList<>(launcherActivities.getList()); |