Merge "Use WP2 BuildCompat library until androidx library stabilizes Bug:... (2a0b5c81) · Commits · e / os / android_packages_apps_ThemePicker

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.view.MenuItem;

		import androidx.annotation.IdRes;
		import androidx.annotation.Nullable;
		import androidx.core.os.BuildCompat;
		import androidx.fragment.app.Fragment;
		import androidx.fragment.app.FragmentActivity;
		import androidx.fragment.app.FragmentManager;
		@@ -57,6 +56,7 @@ import com.android.customization.picker.theme.ThemeFragment;
		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;
		@@ -179,6 +179,9 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal
		if (!BuildCompat.isAtLeastQ()) {
		return;
		}
		//if (!BuildCompat.isAtLeastQ()) {
		// return;
		//}
		if (Build.TYPE.equals("user")) {
		return;
		}