Don't use WallpaperPicker2 BuildCompat
packages/apps/WallpaperPicker2 has its own copy of BuildCompat,
supposedly to allow overriding the SDK version in tests, but that
feature is never used and having an extra copy causes more work
every time the platform version is updated or finalized. Use
checks against android.os.Build.VERSION.SDK_INT instead. Future
checks against development versions should use the offical
androidx.core.os.BuildCompat.
Bug: 186121492
Test: m ThemePicker
Change-Id: I6a30d63c10cea4c743d98bc778255b333796c953
Merged-In: I6a30d63c10cea4c743d98bc778255b333796c953
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index 786bebd..c97a8eb 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -19,6 +19,7 @@
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
+import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.util.Log;
@@ -59,7 +60,6 @@
import com.android.customization.picker.theme.ThemeFragment.ThemeFragmentHost;
import com.android.customization.widget.NoTintDrawableWrapper;
import com.android.wallpaper.R;
-import com.android.wallpaper.compat.BuildCompat;
import com.android.wallpaper.model.WallpaperInfo;
import com.android.wallpaper.module.DailyLoggingAlarmScheduler;
import com.android.wallpaper.module.FormFactorChecker;
@@ -213,7 +213,7 @@
private void initSections() {
mSections.clear();
- if (!BuildCompat.isAtLeastQ()) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
Log.d(TAG, "Build version < Q detected");
return;
}