diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-01-31 00:02:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-31 00:02:31 +0000 |
| commit | 206b8bccb851c6151c98ca48fa1fd8a3c45beb28 (patch) | |
| tree | e9c5cb01a8ee610a327383c99245f625d9bd9664 | |
| parent | 505f9a95651849645dcc6f6f57e274b03498f424 (diff) | |
| parent | b7096ecda6ba9a5a86b4b7e97d658bd59213078d (diff) | |
| download | android_packages_apps_Trebuchet-206b8bccb851c6151c98ca48fa1fd8a3c45beb28.tar.gz android_packages_apps_Trebuchet-206b8bccb851c6151c98ca48fa1fd8a3c45beb28.tar.bz2 android_packages_apps_Trebuchet-206b8bccb851c6151c98ca48fa1fd8a3c45beb28.zip | |
Merge "Fixing Robolectic tests" into ub-launcher3-master
| -rw-r--r-- | robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java | 5 |
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)); |