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

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

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

Change-Id: Idca50a2a4a52a46c66a4bb224f0070b02c24669f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-02 20:34:46 +00:00
committed by Automerger Merge Worker
parent 81a9be3118 b2aad08eb8
commit a73badef99
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/ShortcutPackage.java
View File

@@ -706,7 +706,7 @@ class ShortcutPackage extends ShortcutPackageItem {
} }
pinnedShortcuts.addAll(pinned); pinnedShortcuts.addAll(pinned);
}); });
// Then, update the pinned state if necessary. // Secondly, update the pinned state if necessary.
final List<ShortcutInfo> pinned = findAll(pinnedShortcuts); final List<ShortcutInfo> pinned = findAll(pinnedShortcuts);
if (pinned != null) { if (pinned != null) {
pinned.forEach(si -> { pinned.forEach(si -> {
@@ -720,6 +720,8 @@ class ShortcutPackage extends ShortcutPackageItem {
si.clearFlags(ShortcutInfo.FLAG_PINNED); 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. // Lastly, remove the ones that are no longer pinned, cached nor dynamic.
removeOrphans(); removeOrphans();