summaryrefslogtreecommitdiffstats
path: root/robolectric_tests
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2019-01-30 15:46:47 -0800
committerSunny Goyal <sunnygoyal@google.com>2019-01-30 15:47:03 -0800
commitb7096ecda6ba9a5a86b4b7e97d658bd59213078d (patch)
tree2c1f9da940e772f48a47af2296a3144fcfacdbea /robolectric_tests
parent83be8b20dd24ab954b9640cb2414eb4a362c3f26 (diff)
downloadandroid_packages_apps_Trebuchet-b7096ecda6ba9a5a86b4b7e97d658bd59213078d.tar.gz
android_packages_apps_Trebuchet-b7096ecda6ba9a5a86b4b7e97d658bd59213078d.tar.bz2
android_packages_apps_Trebuchet-b7096ecda6ba9a5a86b4b7e97d658bd59213078d.zip
Fixing Robolectic tests
Bug: 123652178 Change-Id: Ie8b0a23fb8bd0d46ac59c26d75c81a68e6152beb
Diffstat (limited to 'robolectric_tests')
-rw-r--r--robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java
index 92d065e30..ab3927466 100644
--- a/robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java
+++ b/robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java
@@ -25,11 +25,9 @@ import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherModel.Callbacks;
import com.android.launcher3.LauncherModel.ModelUpdateTask;
import com.android.launcher3.LauncherProvider;
-import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.icons.IconCache;
import com.android.launcher3.icons.cache.CachingLogic;
import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.Provider;
import com.android.launcher3.util.TestLauncherProvider;
import org.junit.Before;
@@ -45,6 +43,7 @@ import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.Executor;
+import java.util.function.Supplier;
import androidx.annotation.NonNull;
@@ -196,7 +195,7 @@ public class BaseModelUpdateTaskTestCase {
@Override
protected <T> CacheEntry cacheLocked(
@NonNull ComponentName componentName,
- UserHandle user, @NonNull Provider<T> infoProvider,
+ UserHandle user, @NonNull Supplier<T> infoProvider,
@NonNull CachingLogic<T> cachingLogic,
boolean usePackageIcon, boolean useLowResIcon) {
CacheEntry entry = mCache.get(new ComponentKey(componentName, user));