diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2017-01-05 10:55:42 -0800 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-01-05 10:55:42 -0800 |
commit | b0d77fe35f0d2e84154f4e1c4426ed3845361998 (patch) | |
tree | 0884a0afa3f99f5afa21e5af683e718198bf88ad /tests/src/com/android/launcher3/model | |
parent | a39a98dac95e9fd3e5b1b40673ec2ac8f52dfdaf (diff) | |
download | android_packages_apps_Trebuchet-b0d77fe35f0d2e84154f4e1c4426ed3845361998.tar.gz android_packages_apps_Trebuchet-b0d77fe35f0d2e84154f4e1c4426ed3845361998.tar.bz2 android_packages_apps_Trebuchet-b0d77fe35f0d2e84154f4e1c4426ed3845361998.zip |
Revert "Build empty test apk until junit dependency issue is sorted out."
This reverts commit 4c82c33a64b9f6719a0a1457361362cf70e2c9ac.
Change-Id: I39c142e2b0e882245a6928264465578e4ddc12c9
Diffstat (limited to 'tests/src/com/android/launcher3/model')
-rw-r--r-- | tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index f23a574e9..1d092ab04 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -8,6 +8,7 @@ import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.os.Process; import android.os.UserHandle; +import android.support.annotation.NonNull; import android.support.test.InstrumentationRegistry; import android.test.ProviderTestCase2; @@ -24,6 +25,7 @@ import com.android.launcher3.LauncherModel.Callbacks; import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.util.Provider; import com.android.launcher3.util.TestLauncherProvider; import org.mockito.ArgumentCaptor; @@ -184,9 +186,10 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP } @Override - protected CacheEntry cacheLocked(ComponentName componentName, - LauncherActivityInfoCompat info, UserHandle user, - boolean usePackageIcon, boolean useLowResIcon) { + protected CacheEntry cacheLocked( + @NonNull ComponentName componentName, + @NonNull Provider<LauncherActivityInfoCompat> infoProvider, + UserHandle user, boolean usePackageIcon, boolean useLowResIcon) { CacheEntry entry = mCache.get(new ComponentKey(componentName, user)); if (entry == null) { entry = new CacheEntry(); |