From eace95ab94e97c49dcfe58456117835163349ae4 Mon Sep 17 00:00:00 2001
From: Priyanka Advani <padvani@google.com>
Date: Tue, 6 Feb 2024 19:00:51 +0000
Subject: [PATCH] Revert "Fix widget restore for pre-archived apps"

Revert submission 26049200-widget-restore-fix

Reason for revert: Build breakage in b/324091151

Reverted changes: /q/submissionid:26049200-widget-restore-fix

Change-Id: I8a43650ba3f4590f49f038691d34238231f0747c
---
 .../launcher3/model/WorkspaceItemProcessor.kt |  4 +---
 .../launcher3/util/PackageManagerHelper.java  | 19 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/com/android/launcher3/model/WorkspaceItemProcessor.kt b/src/com/android/launcher3/model/WorkspaceItemProcessor.kt
index d32ec659cb..44c41c1770 100644
--- a/src/com/android/launcher3/model/WorkspaceItemProcessor.kt
+++ b/src/com/android/launcher3/model/WorkspaceItemProcessor.kt
@@ -434,9 +434,7 @@ class WorkspaceItemProcessor(
                     !c.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_RESTORE_STARTED) &&
                         !isSafeMode &&
                         (si == null) &&
-                        (lapi == null) &&
-                        !(Flags.enableSupportForArchiving() &&
-                            pmHelper.isAppArchived(component.packageName))
+                        (lapi == null)
                 ) {
                     // Restore never started
                     c.markDeleted(
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 145651d561..50d8886980 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -16,9 +16,6 @@
 
 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;
@@ -109,22 +106,6 @@ 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
      */