commit af3bc37e0c8fe6ca5317698407a807b2f0510cc4
author Xin Li <delphij@google.com> Mon Jun 14 21:52:01 2021 -0700
committer Xin Li <delphij@google.com> Thu Jun 17 21:55:14 2021 +0000
tree e52e16d45fe244f9956a968b2e33c8558786dc3b
parent 37e3f4fdd47d6d964aaef344a00b4c424550440d
parent a41d894e3da5af23812c482c18a7feab2b56d38b

DO NOT MERGE - Merge ab/7272582

Bug: 190855093
Merged-In: I471a711ad51515c8b4586b4e8a9b1e8e88b5b7d4
Change-Id: Iddb7ddd33420d902eb540fd9b3d2e6b7aa7c046f

Android.mk

diff --git a/Android.mk b/Android.mk
index 987c875..dd833f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,8 @@
 LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_PACKAGE_NAME := ThemePicker
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := WallpaperPicker2

src/com/android/customization/picker/CustomizationPickerActivity.java

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;
         }