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

Commit 47ed1718 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Fix WTF in shortcuts. 

Bug: 69003626
com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests

Change-Id: Ie65ee2ebffedeaad60ce24cddb63278e03a1c1b6
parent e6abcbed

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

+1 −2
Original line number Diff line number Diff line
@@ -459,8 +459,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
        }



        // Then, for the pinned set for each launcher, set the pin flag one by one.

        mShortcutUser.mService.getUserShortcutsLocked(getPackageUserId())

                .forAllLaunchers(launcherShortcuts -> {

        mShortcutUser.forAllLaunchers(launcherShortcuts -> {

            final ArraySet<String> pinned = launcherShortcuts.getPinnedShortcutIds(

                    getPackageName(), getPackageUserId());