diff options
author | Pinyao Ting <pinyaoting@google.com> | 2019-09-16 19:53:58 +0000 |
---|---|---|
committer | Pinyao Ting <pinyaoting@google.com> | 2019-09-16 20:20:38 +0000 |
commit | d13f0c5c45550bffc335f47f1a0c545df68c0584 (patch) | |
tree | 82ab019fd4bb7032442735b8cd67b7936889cf0a /iconloaderlib | |
parent | 3463d1c5f9e9b5b5014a5326fbbc812a834aadb8 (diff) | |
download | android_packages_apps_Trebuchet-d13f0c5c45550bffc335f47f1a0c545df68c0584.tar.gz android_packages_apps_Trebuchet-d13f0c5c45550bffc335f47f1a0c545df68c0584.tar.bz2 android_packages_apps_Trebuchet-d13f0c5c45550bffc335f47f1a0c545df68c0584.zip |
Revert "Revert "cache shourtcut image""
This reverts commit f3d58f1f84192a0446ba3bf2fcfd773ad538bdde.
Reason for revert: Rolling forward for development and fixes.
Bug: 140242324
Change-Id: I954cface2e50a5a9a5e143d2ea29fbcebb298ede
Diffstat (limited to 'iconloaderlib')
-rw-r--r-- | iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java | 8 | ||||
-rw-r--r-- | iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java b/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java index 09f59b84c..16bc7ae83 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java +++ b/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java @@ -17,6 +17,7 @@ package com.android.launcher3.icons.cache; import android.content.ComponentName; import android.content.Context; +import android.content.pm.PackageInfo; import android.os.LocaleList; import android.os.UserHandle; @@ -41,4 +42,11 @@ public interface CachingLogic<T> { default String getKeywords(T object, LocaleList localeList) { return null; } + + /** + * Returns the timestamp the entry was last updated in cache. + */ + default long getLastUpdatedTime(T object, PackageInfo info) { + return info.lastUpdateTime; + } } diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java b/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java index 3c71bd027..bcdbce5e2 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java +++ b/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java @@ -171,8 +171,9 @@ public class IconCacheUpdateHandler { long updateTime = c.getLong(indexLastUpdate); int version = c.getInt(indexVersion); T app = componentMap.remove(component); - if (version == info.versionCode && updateTime == info.lastUpdateTime && - TextUtils.equals(c.getString(systemStateIndex), + if (version == info.versionCode + && updateTime == cachingLogic.getLastUpdatedTime(app, info) + && TextUtils.equals(c.getString(systemStateIndex), mIconCache.getIconSystemState(info.packageName))) { if (mFilterMode == MODE_CLEAR_VALID_ITEMS) { @@ -231,7 +232,6 @@ public class IconCacheUpdateHandler { } } - /** * A runnable that updates invalid icons and adds missing icons in the DB for the provided * LauncherActivityInfo list. Items are updated/added one at a time, so that the |