Merge "Fix widget restore for pre-archived apps" into main (2e094493) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/model/WorkspaceItemProcessor.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -433,7 +433,9 @@ class WorkspaceItemProcessor(
		!c.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_RESTORE_STARTED) &&
		!isSafeMode &&
		(si == null) &&
		(lapi == null)
		(lapi == null) &&
		!(Flags.enableSupportForArchiving() &&
		pmHelper.isAppArchived(component.packageName))
		) {
		// Restore never started
		c.markDeleted(

+19 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package com.android.launcher3.util;


		import static android.content.pm.PackageManager.MATCH_ARCHIVED_PACKAGES;

		import static com.android.launcher3.Flags.enableSupportForArchiving;

		import android.content.ActivityNotFoundException;
		@@ -106,6 +109,22 @@ public class PackageManagerHelper {
		return info != null;
		}

		/**
		* Returns whether the target app is in archived state
		*/
		@SuppressWarnings("NewApi")
		public boolean isAppArchived(@NonNull final String packageName) {
		final ApplicationInfo info;
		try {
		info = mPm.getPackageInfo(packageName,
		PackageManager.PackageInfoFlags.of(MATCH_ARCHIVED_PACKAGES)).applicationInfo;
		return info.isArchived;
		} catch (NameNotFoundException e) {
		Log.e(TAG, "Failed to get applicationInfo for package: " + packageName, e);
		return false;
		}
		}

		/**
		* Returns the application info for the provided package or null
		*/