Converting some caching logic booleans to lookup flags
Bug: 366237794 Test: atest IconCacheTest Flag: EXEMPT refactor Change-Id: I0d25996181954df22e1cb61596be0a2694ee7068
This commit is contained in:
1 parent
1b1ce734f0
commit
e978f6cedb
5 files changed
+160
-22
No files matched your search
@@ -15,21 +15,39 @@
|
||||
*/
|
||||
package com.android.launcher3.icons;
|
||||
|
||||
import static android.os.Process.myUserHandle;
|
||||
|
||||
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
|
||||
|
||||
import static com.android.launcher3.icons.IconCache.EXTRA_SHORTCUT_BADGE_OVERRIDE_PACKAGE;
|
||||
import static com.android.launcher3.icons.IconCacheUpdateHandlerTestKt.waitForUpdateHandlerToFinish;
|
||||
import static com.android.launcher3.model.data.AppInfo.makeLaunchIntent;
|
||||
import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
|
||||
import static com.android.launcher3.util.LauncherModelHelper.TEST_ACTIVITY;
|
||||
import static com.android.launcher3.util.LauncherModelHelper.TEST_PACKAGE;
|
||||
import static com.android.launcher3.util.TestUtil.runOnExecutorSync;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.ContextWrapper;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.LauncherActivityInfo;
|
||||
import android.content.pm.LauncherApps;
|
||||
import android.content.pm.ShortcutInfo;
|
||||
import android.content.pm.ShortcutInfo.Builder;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Bitmap.Config;
|
||||
import android.graphics.drawable.Icon;
|
||||
import android.os.PersistableBundle;
|
||||
import android.os.UserHandle;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
@@ -37,15 +55,30 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
import androidx.test.filters.SmallTest;
|
||||
|
||||
import com.android.launcher3.InvariantDeviceProfile;
|
||||
import com.android.launcher3.icons.cache.CachingLogic;
|
||||
import com.android.launcher3.icons.cache.IconCacheUpdateHandler;
|
||||
import com.android.launcher3.icons.cache.LauncherActivityCachingLogic;
|
||||
import com.android.launcher3.model.data.AppInfo;
|
||||
import com.android.launcher3.model.data.ItemInfoWithIcon;
|
||||
import com.android.launcher3.model.data.PackageItemInfo;
|
||||
import com.android.launcher3.model.data.WorkspaceItemInfo;
|
||||
import com.android.launcher3.settings.SettingsActivity;
|
||||
import com.android.launcher3.shortcuts.ShortcutKey;
|
||||
import com.android.launcher3.util.ApplicationInfoWrapper;
|
||||
import com.android.launcher3.util.ComponentKey;
|
||||
import com.android.launcher3.util.PackageUserKey;
|
||||
import com.android.launcher3.util.RoboApiWrapper;
|
||||
|
||||
import com.google.common.truth.Truth;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class IconCacheTest {
|
||||
@@ -112,6 +145,102 @@ public class IconCacheTest {
|
||||
assertEquals(((PackageItemInfo) item).packageName, otherPackage);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void launcherActivityInfo_cached_in_memory() {
|
||||
RoboApiWrapper.INSTANCE.initialize();
|
||||
ComponentName cn = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY);
|
||||
UserHandle user = myUserHandle();
|
||||
ComponentKey cacheKey = new ComponentKey(cn, user);
|
||||
|
||||
LauncherActivityInfo lai = mContext.getSystemService(LauncherApps.class)
|
||||
.resolveActivity(makeLaunchIntent(cn), user);
|
||||
assertNotNull(lai);
|
||||
|
||||
WorkspaceItemInfo info = new WorkspaceItemInfo();
|
||||
info.intent = makeLaunchIntent(cn);
|
||||
runOnExecutorSync(MODEL_EXECUTOR,
|
||||
() -> mIconCache.getTitleAndIcon(info, lai, false));
|
||||
assertNotNull(info.bitmap);
|
||||
assertFalse(info.bitmap.isLowRes());
|
||||
|
||||
// Verify that icon is in memory cache
|
||||
runOnExecutorSync(MODEL_EXECUTOR,
|
||||
() -> assertNotNull(mIconCache.getInMemoryEntryLocked(cacheKey)));
|
||||
|
||||
// Schedule async update and wait for it to complete
|
||||
Set<PackageUserKey> updates =
|
||||
executeIconUpdate(lai, LauncherActivityCachingLogic.INSTANCE);
|
||||
|
||||
// Verify that the icon was not updated and is still in memory cache
|
||||
Truth.assertThat(updates).isEmpty();
|
||||
runOnExecutorSync(MODEL_EXECUTOR,
|
||||
() -> assertNotNull(mIconCache.getInMemoryEntryLocked(cacheKey)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shortcutInfo_not_cached_in_memory() {
|
||||
CacheableShortcutInfo si = mockShortcutInfo(0);
|
||||
ShortcutKey cacheKey = ShortcutKey.fromInfo(si.getShortcutInfo());
|
||||
|
||||
WorkspaceItemInfo info = new WorkspaceItemInfo();
|
||||
runOnExecutorSync(MODEL_EXECUTOR, () -> mIconCache.getShortcutIcon(info, si));
|
||||
assertNotNull(info.bitmap);
|
||||
assertFalse(info.bitmap.isLowRes());
|
||||
|
||||
// Verify that icon is in memory cache
|
||||
runOnExecutorSync(MODEL_EXECUTOR,
|
||||
() -> assertNull(mIconCache.getInMemoryEntryLocked(cacheKey)));
|
||||
|
||||
Set<PackageUserKey> updates =
|
||||
executeIconUpdate(si, CacheableShortcutCachingLogic.INSTANCE);
|
||||
// Verify that the icon was not updated and is still in memory cache
|
||||
Truth.assertThat(updates).isEmpty();
|
||||
runOnExecutorSync(MODEL_EXECUTOR,
|
||||
() -> assertNull(mIconCache.getInMemoryEntryLocked(cacheKey)));
|
||||
|
||||
// Now update the shortcut with a newer version
|
||||
updates = executeIconUpdate(
|
||||
mockShortcutInfo(System.currentTimeMillis() + 2000),
|
||||
CacheableShortcutCachingLogic.INSTANCE);
|
||||
|
||||
// Verify that icon was updated but it is still not in mem-cache
|
||||
Truth.assertThat(updates).containsExactly(
|
||||
new PackageUserKey(cacheKey.getPackageName(), cacheKey.user));
|
||||
runOnExecutorSync(MODEL_EXECUTOR,
|
||||
() -> assertNull(mIconCache.getInMemoryEntryLocked(cacheKey)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes the icon update for the provided entry and returns the updated packages
|
||||
*/
|
||||
private <T> Set<PackageUserKey> executeIconUpdate(T object, CachingLogic<T> cachingLogic) {
|
||||
HashSet<PackageUserKey> updates = new HashSet<>();
|
||||
|
||||
runOnExecutorSync(MODEL_EXECUTOR, () -> {
|
||||
IconCacheUpdateHandler updateHandler = mIconCache.getUpdateHandler();
|
||||
updateHandler.updateIcons(
|
||||
Collections.singletonList(object),
|
||||
cachingLogic,
|
||||
(a, b) -> a.forEach(p -> updates.add(new PackageUserKey(p, b))));
|
||||
updateHandler.finish();
|
||||
});
|
||||
waitForUpdateHandlerToFinish(mIconCache);
|
||||
return updates;
|
||||
}
|
||||
|
||||
private CacheableShortcutInfo mockShortcutInfo(long updateTime) {
|
||||
ShortcutInfo info = new ShortcutInfo.Builder(
|
||||
getInstrumentation().getContext(), "test-shortcut")
|
||||
.setIntent(new Intent(Intent.ACTION_VIEW))
|
||||
.setShortLabel("Test")
|
||||
.setIcon(Icon.createWithBitmap(Bitmap.createBitmap(200, 200, Config.ARGB_8888)))
|
||||
.build();
|
||||
ShortcutInfo spied = spy(info);
|
||||
doReturn(updateTime).when(spied).getLastChangedTimestamp();
|
||||
return new CacheableShortcutInfo(spied,
|
||||
new ApplicationInfoWrapper(getInstrumentation().getContext().getApplicationInfo()));
|
||||
}
|
||||
|
||||
private ItemInfoWithIcon getBadgingInfo(Context context,
|
||||
@Nullable ComponentName cn, @Nullable String badgeOverride) throws Exception {
|
||||
Builder builder = new Builder(context, "test-shortcut")
|
||||
|
||||
Reference in new issue
Block a user