Merge "Adding additional logging around updated shortcuts" into main (a8058669) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/model/PackageUpdatedTask.java

+21 −7

Original line number	Diff line number	Diff line
		@@ -244,7 +244,16 @@ public class PackageUpdatedTask implements ModelUpdateTask {
		.query(ShortcutRequest.PINNED);
		if (shortcut.isEmpty()) {
		isTargetValid = false;
		if (DEBUG) {
		Log.d(TAG, "Pinned Shortcut not found for updated"
		+ " package=" + si.getTargetPackage());
		}
		} else {
		if (DEBUG) {
		Log.d(TAG, "Found pinned shortcut for updated"
		+ " package=" + si.getTargetPackage()
		+ ", isTargetValid=" + isTargetValid);
		}
		si.updateFromDeepShortcutInfo(shortcut.get(0), context);
		infoUpdated = true;
		}
		@@ -252,6 +261,7 @@ public class PackageUpdatedTask implements ModelUpdateTask {
		isTargetValid = context.getSystemService(LauncherApps.class)
		.isActivityEnabled(cn, mUser);
		}

		if (!isTargetValid && (si.hasStatusFlag(
		FLAG_RESTORED_ICON \| FLAG_AUTOINSTALL_ICON)
		\|\| si.isArchived())) {
		@@ -260,20 +270,24 @@ public class PackageUpdatedTask implements ModelUpdateTask {
		} else if (si.hasPromiseIconUi()) {
		removedShortcuts.add(si.id);
		if (DEBUG) {
		Log.d(TAG, "Removing restored shortcut promise icon"
		FileLog.w(TAG, "Removing restored shortcut promise icon"
		+ " that no longer points to valid component."
		+ " id=" + si.id
		+ ", package=" + si.getTargetPackage());
		+ ", package=" + si.getTargetPackage()
		+ ", status=" + si.status
		+ ", isArchived=" + si.isArchived());
		}
		return;
		}
		} else if (!isTargetValid) {
		removedShortcuts.add(si.id);
		FileLog.e(TAG, "Removing shortcut that no longer points to"
		if (DEBUG) {
		FileLog.w(TAG, "Removing shortcut that no longer points to"
		+ " valid component."
		+ " id=" + si.id
		+ " package=" + si.getTargetPackage()
		+ " status=" + si.status);
		}
		return;
		} else {
		si.status = WorkspaceItemInfo.DEFAULT;

src/com/android/launcher3/model/data/WorkspaceItemInfo.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ShortcutInfo;
		import android.text.TextUtils;
		import android.util.Log;

		import androidx.annotation.NonNull;

		@@ -186,9 +187,12 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
		if (shortcutInfo.isEnabled()) {
		runtimeStatusFlags &= ~FLAG_DISABLED_BY_PUBLISHER;
		} else {
		Log.w(TAG, "updateFromDeepShortcutInfo: Updated shortcut has been disabled. "
		+ " package=" + shortcutInfo.getPackage()
		+ " disabledReason=" + shortcutInfo.getDisabledReason());
		runtimeStatusFlags \|= FLAG_DISABLED_BY_PUBLISHER;
		}
		disabledMessage = shortcutInfo.getDisabledMessage();

		if (shortcutInfo.getDisabledReason() == ShortcutInfo.DISABLED_REASON_VERSION_LOWER) {
		runtimeStatusFlags \|= FLAG_DISABLED_VERSION_LOWER;
		} else {