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

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

Merge "Fix crash in secondary user"

parents de02aeb9 3303cd3f

core/java/com/android/internal/app/ChooserActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,8 @@ public class ChooserActivity extends ResolverActivity { 
                LauncherApps.ShortcutQuery query = new LauncherApps.ShortcutQuery();

                query.setIntent(getTargetIntent());

                query.setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_CHOOSER);

                List<ShortcutInfo> shortcuts = launcherApps.getShortcuts(query, UserHandle.SYSTEM);

                List<ShortcutInfo> shortcuts = launcherApps.getShortcuts(query,

                        android.os.Process.myUserHandle());

                if (DEBUG) Log.d(TAG, "Adding " + shortcuts.size() + " chooser shortcuts");

                addShortcuts(shortcuts);

                mAreChooserShortcutsRetrieved = true;