Include additional logging to debug shortcut restore issues
Bug: 338218961
Test: manual
Flag: EXEMPT bugfix
Change-Id: I13cb16e4d84ccea30d4060858ff87a688b48807d
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 4c95e83..563cfa4 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -1239,6 +1239,8 @@
@NonNull final ShortcutQueryWrapper query, @NonNull final UserHandle targetUser) {
ensureShortcutPermission(callingPackage);
if (!canAccessProfile(targetUser.getIdentifier(), "Cannot get shortcuts")) {
+ Log.e(TAG, "return empty shortcuts because callingPackage " + callingPackage
+ + " cannot access user " + targetUser.getIdentifier());
return new ParceledListSlice<>(Collections.EMPTY_LIST);
}
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
index c929c1f..84674b2 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -850,6 +850,8 @@
@Nullable Predicate<ShortcutInfo> filter, int cloneFlag,
@Nullable String callingLauncher, int launcherUserId, boolean getPinnedByAnyLauncher) {
if (getPackageInfo().isShadow()) {
+ Log.d(TAG, "findAll() returned empty results because " + getPackageName()
+ + " isn't installed yet");
// Restored and the app not installed yet, so don't return any.
return;
}
@@ -877,6 +879,8 @@
if (!getPinnedByAnyLauncher) {
if (si.isFloating() && !si.isCached()) {
if (!isPinnedByCaller) {
+ Log.d(TAG, si.getId() + " ignored because it isn't pinned by "
+ + callingLauncher);
return;
}
}
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 9edf3b1..1cd77ff 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -3029,6 +3029,10 @@
final ShortcutUser user = getUserShortcutsLocked(userId);
final ShortcutPackage p = user.getPackageShortcutsIfExists(packageName);
if (p == null) {
+ if (DEBUG_REBOOT) {
+ Log.d(TAG, "getShortcutsInnerLocked() returned empty results because "
+ + packageName + " isn't loaded");
+ }
return; // No need to instantiate ShortcutPackage.
}