diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-24 16:58:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-24 16:58:17 +0000 |
| commit | 05242783be856371fc98fa1f8c0490cfe9a19e0a (patch) | |
| tree | 0e33aeed72e8d399486ce3229d080a06306b2e13 /tests | |
| parent | 33070628142fb9e236b2cbe8610dd673719dc194 (diff) | |
| parent | 1b7f208cdf6e98269504f82726d9fe4bc44f12c3 (diff) | |
| download | platform_packages_apps_WallpaperPicker2-05242783be856371fc98fa1f8c0490cfe9a19e0a.tar.gz platform_packages_apps_WallpaperPicker2-05242783be856371fc98fa1f8c0490cfe9a19e0a.tar.bz2 platform_packages_apps_WallpaperPicker2-05242783be856371fc98fa1f8c0490cfe9a19e0a.zip | |
Merge "Remove WallpaperPicker2 BuildCompat" into sc-dev-plus-aosp
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/wallpaper/testing/TestCurrentWallpaperInfoFactory.java | 4 | ||||
| -rw-r--r-- | tests/src/com/android/wallpaper/testing/TestWallpaperRefresher.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/com/android/wallpaper/testing/TestCurrentWallpaperInfoFactory.java b/tests/src/com/android/wallpaper/testing/TestCurrentWallpaperInfoFactory.java index 3e8c665..63cdf29 100644 --- a/tests/src/com/android/wallpaper/testing/TestCurrentWallpaperInfoFactory.java +++ b/tests/src/com/android/wallpaper/testing/TestCurrentWallpaperInfoFactory.java @@ -16,8 +16,8 @@ package com.android.wallpaper.testing; import android.content.Context; +import android.os.Build; -import com.android.wallpaper.compat.BuildCompat; import com.android.wallpaper.model.WallpaperInfo; import com.android.wallpaper.module.CurrentWallpaperInfoFactory; import com.android.wallpaper.module.InjectorProvider; @@ -48,7 +48,7 @@ public class TestCurrentWallpaperInfoFactory implements CurrentWallpaperInfoFact homeWallpaperMetadata.getCollectionId()); WallpaperInfo lockWallpaper = null; - if (lockWallpaperMetadata != null && BuildCompat.isAtLeastN()) { + if (lockWallpaperMetadata != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { lockWallpaper = createTestWallpaperInfo( lockWallpaperMetadata.getAttributions(), lockWallpaperMetadata.getActionUrl(), diff --git a/tests/src/com/android/wallpaper/testing/TestWallpaperRefresher.java b/tests/src/com/android/wallpaper/testing/TestWallpaperRefresher.java index 97961fe..558c3cb 100644 --- a/tests/src/com/android/wallpaper/testing/TestWallpaperRefresher.java +++ b/tests/src/com/android/wallpaper/testing/TestWallpaperRefresher.java @@ -18,8 +18,8 @@ package com.android.wallpaper.testing; import android.app.WallpaperManager; import android.content.Context; +import android.os.Build; -import com.android.wallpaper.compat.BuildCompat; import com.android.wallpaper.model.WallpaperMetadata; import com.android.wallpaper.module.InjectorProvider; import com.android.wallpaper.module.WallpaperPreferences; @@ -45,7 +45,7 @@ public class TestWallpaperRefresher implements WallpaperRefresher { WallpaperPreferences prefs = InjectorProvider.getInjector().getPreferences(mAppContext); - if (BuildCompat.isAtLeastN() && prefs.getLockWallpaperId() > 0) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && prefs.getLockWallpaperId() > 0) { listener.onRefreshed( new WallpaperMetadata( prefs.getHomeWallpaperAttributions(), |