Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec512395 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

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: Ibb8ff932e3b31c7ddcd334e495768e35aeff91fc
parent 3c8e60e4

iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java

+3 −6
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.content.pm.ApplicationInfo; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.PackageInfoFlags;

import android.content.res.Resources;

import android.database.Cursor;

import android.database.sqlite.SQLiteDatabase;
@@ -47,6 +46,7 @@ import android.os.Handler; 
import android.os.LocaleList;

import android.os.Looper;

import android.os.Process;

import android.os.SystemClock;

import android.os.Trace;

import android.os.UserHandle;

import android.text.TextUtils;
@@ -554,7 +554,6 @@ public abstract class BaseIconCache { 
     */

    @WorkerThread

    @NonNull

    @SuppressWarnings("NewApi")

    protected CacheEntry getEntryForPackageLocked(@NonNull final String packageName,

            @NonNull final UserHandle user, final boolean useLowResIcon) {

        assertWorkerThread();
@@ -568,11 +567,9 @@ public abstract class BaseIconCache { 
            // Check the DB first.

            if (!getEntryFromDBLocked(cacheKey, entry, useLowResIcon)) {

                try {

                    long flags = Process.myUserHandle().equals(user) ? 0 :

                    int flags = Process.myUserHandle().equals(user) ? 0 :

                            PackageManager.GET_UNINSTALLED_PACKAGES;

                    flags |= PackageManager.MATCH_ARCHIVED_PACKAGES;

                    PackageInfo info = mPackageManager.getPackageInfo(packageName,

                            PackageInfoFlags.of(flags));

                    PackageInfo info = mPackageManager.getPackageInfo(packageName, flags);

                    ApplicationInfo appInfo = info.applicationInfo;

                    if (appInfo == null) {

                        throw new NameNotFoundException("ApplicationInfo is null");