Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in secondary user

Browse Source 
Test: manual test
Change-Id: If406807094f216fd3cfd80db7c6498c954a3fc95
Fix: 35938801
This commit is contained in:
Makoto Onuki
2017-03-03 13:33:05 -08:00
parent 2c66f192ca
commit 3303cd3f9a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -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;