diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index dee0efc277..f36bee4f0e 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/src/com/android/launcher3/icons/IconCache.java @@ -283,8 +283,8 @@ public class IconCache extends BaseIconCache { @SuppressWarnings("NewApi") public synchronized void getTitleAndIcon(ItemInfoWithIcon info, LauncherActivityInfo activityInfo, @NonNull CacheLookupFlag lookupFlag) { - boolean isAppArchived = Flags.enableSupportForArchiving() && activityInfo != null - && activityInfo.getActivityInfo().isArchived; + boolean isAppArchived = Utilities.ATLEAST_V && (Flags.enableSupportForArchiving() && activityInfo != null + && activityInfo.getActivityInfo().isArchived); // If we already have activity info, no need to use package icon getTitleAndIcon(info, () -> activityInfo, lookupFlag.withUsePackageIcon(isAppArchived)); } diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java index ead22f6a8f..d937e12f3e 100644 --- a/src/com/android/launcher3/model/ItemInstallQueue.java +++ b/src/com/android/launcher3/model/ItemInstallQueue.java @@ -49,6 +49,7 @@ import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherSettings.Favorites; +import com.android.launcher3.Utilities; import com.android.launcher3.dagger.ApplicationContext; import com.android.launcher3.dagger.LauncherAppSingleton; import com.android.launcher3.dagger.LauncherBaseAppComponent; @@ -325,7 +326,7 @@ public class ItemInstallQueue { lai = laiList.get(0); si.intent = makeLaunchIntent(lai); try { - if (Flags.enableSupportForArchiving() + if (Utilities.ATLEAST_V && Flags.enableSupportForArchiving() && lai.getActivityInfo().isArchived) { si.runtimeStatusFlags |= FLAG_ARCHIVED; } diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 2d40df51f5..d3c979302a 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -433,7 +433,7 @@ public class LoaderCursor extends CursorWrapper { boolean loadIconFromCache, WorkspaceItemInfo info ) { - boolean isPreArchived = Flags.enableSupportForArchiving() + boolean isPreArchived = Utilities.ATLEAST_V && Flags.enableSupportForArchiving() && Flags.restoreArchivedAppIconsFromDb() && info.isInactiveArchive() && LauncherPrefs.get(mContext).get(LauncherPrefs.IS_FIRST_LOAD_AFTER_RESTORE); diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index 6fd996c0a3..0424ae1799 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -453,7 +453,7 @@ public class LoaderTask implements Runnable { final HashMap installingPkgs = mSessionHelper.getActiveSessions(); - if (Flags.enableSupportForArchiving()) { + if (Utilities.ATLEAST_V && Flags.enableSupportForArchiving()) { mInstallingPkgsCached = installingPkgs; } installingPkgs.forEach(mIconCache::updateSessionCache); @@ -642,7 +642,7 @@ public class LoaderTask implements Runnable { AppInfo appInfo = new AppInfo(app, mUserCache.getUserInfo(user), ApiWrapper.INSTANCE.get(mContext), mPmHelper, quietMode); try { - if (Flags.enableSupportForArchiving()) { + if (Utilities.ATLEAST_V && Flags.enableSupportForArchiving()) { if (app.getApplicationInfo().isArchived) { // For archived apps, include progress info in case there is a pending // install session post restart of device. diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java index 4fe3ec45ca..10821dfcea 100644 --- a/src/com/android/launcher3/model/PackageUpdatedTask.java +++ b/src/com/android/launcher3/model/PackageUpdatedTask.java @@ -41,6 +41,7 @@ import com.android.launcher3.Flags; import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.R; +import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.IconCache; import com.android.launcher3.logging.FileLog; @@ -350,7 +351,7 @@ public class PackageUpdatedTask implements ModelUpdateTask { // In case an app is archived, we need to make sure that archived state // in WorkspaceItemInfo is refreshed. try { - if (Flags.enableSupportForArchiving() && !activities.isEmpty()) { + if (Utilities.ATLEAST_V && (Flags.enableSupportForArchiving() && !activities.isEmpty())) { boolean newArchivalState = activities.get(0) .getActivityInfo().isArchived; if (newArchivalState != itemInfo.isArchived()) { diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java index f23639e65e..ee4e579447 100644 --- a/src/com/android/launcher3/model/data/AppInfo.java +++ b/src/com/android/launcher3/model/data/AppInfo.java @@ -198,7 +198,7 @@ public class AppInfo extends ItemInfoWithIcon implements WorkspaceItemFactory { } else { info.runtimeStatusFlags &= ~FLAG_DISABLED_SUSPENDED; } - if (Flags.enableSupportForArchiving()) { + if (Utilities.ATLEAST_V && Flags.enableSupportForArchiving()) { try { if (lai.getActivityInfo().isArchived) { info.runtimeStatusFlags |= FLAG_ARCHIVED; diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java index d4270ed0ad..68eb429d73 100644 --- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java +++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java @@ -182,6 +182,7 @@ public abstract class ItemInfoWithIcon extends ItemInfo { * Returns true if the app corresponding to the item is archived. */ public boolean isArchived() { + if (!Utilities.ATLEAST_V) return false; if (!Flags.enableSupportForArchiving()) { return false; }