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

Commit 3c8e60e4 authored by Piyush Mehrotra's avatar Piyush Mehrotra
Browse files

Fix widget restore for pre-archived apps 

Widgets which were expected to be restored, were missing for apps which were pre-archived.
The fix adds checks for archived apps when processing widgets and ensures that icon with cloud overlay is present on the widget.

Test: Flashed device with build containing this fix.
Bug: 321297173
Change-Id: I2967ed360aae83c8b60a045250a2873a0660e70a
parent 51c5b4f2

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

+6 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 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;
@@ -46,7 +47,6 @@ 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,6 +554,7 @@ public abstract class BaseIconCache { 
     */

    @WorkerThread

    @NonNull

    @SuppressWarnings("NewApi")

    protected CacheEntry getEntryForPackageLocked(@NonNull final String packageName,

            @NonNull final UserHandle user, final boolean useLowResIcon) {

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

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

                try {

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

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

                            PackageManager.GET_UNINSTALLED_PACKAGES;

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

                    flags |= PackageManager.MATCH_ARCHIVED_PACKAGES;

                    PackageInfo info = mPackageManager.getPackageInfo(packageName,

                            PackageInfoFlags.of(flags));

                    ApplicationInfo appInfo = info.applicationInfo;

                    if (appInfo == null) {

                        throw new NameNotFoundException("ApplicationInfo is null");