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

Commit 5c6eec90 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the issue pinned shortcuts went missing after reboot" into tm-dev... 

Merge "Fix the issue pinned shortcuts went missing after reboot" into tm-dev am: b2aad08e am: 9fc310c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701697



Change-Id: Ibe75f22171434a99746850cabf1d36a44bcc6291
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a8d6458 9fc310c6

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

+3 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
            }

            pinnedShortcuts.addAll(pinned);

        });

        // Then, update the pinned state if necessary.

        // Secondly, update the pinned state if necessary.

        final List<ShortcutInfo> pinned = findAll(pinnedShortcuts);

        if (pinned != null) {

            pinned.forEach(si -> {
@@ -720,6 +720,8 @@ class ShortcutPackage extends ShortcutPackageItem { 
                si.clearFlags(ShortcutInfo.FLAG_PINNED);

            }

        });

        // Then, schedule a background job to persist the pinned states.

        mShortcutUser.forAllLaunchers(ShortcutPackageItem::scheduleSave);



        // Lastly, remove the ones that are no longer pinned, cached nor dynamic.

        removeOrphans();