diff options
author | 2022-06-02 20:53:16 +0000 | |
---|---|---|
committer | 2022-06-02 20:53:16 +0000 | |
commit | 1eaa0afe238ebe5128c9a12c02afc12a01196beb (patch) | |
tree | ac200692a434c97efd540933158e6aa759de2eaa | |
parent | ce8a11827177334b8ea6d8859ce92e6f65f617ee (diff) | |
parent | a73badef99edde9677e6f5c44973b0f3aa71f5fd (diff) |
Merge "Fix the issue pinned shortcuts went missing after reboot" into tm-dev am: b2aad08eb8 am: a73badef99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701697
Change-Id: Ia33c63404d9d346dc6a24e4957a5bde5415555cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | services/core/java/com/android/server/pm/ShortcutPackage.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index fa0c6c393cdc..0c601bfde05a 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -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(); |