From 3f6b2d1a61d0c0dcd6af7cc951c1d8c267ed1526 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 22 May 2023 11:51:09 -0700
Subject: [PATCH] Use numeric codes for Android versions, to avoid SDK
dependencies
---
.../main/java/org/libsdl/app/SDLActivity.java | 6 +++---
.../java/org/libsdl/app/SDLAudioManager.java | 20 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index db524b639c76..5987fd87b339 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -93,7 +93,7 @@ public static void debugSource(int sources, String prefix) {
s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ if (Build.VERSION.SDK_INT >= 23) {
tst = InputDevice.SOURCE_BLUETOOTH_STYLUS;
if ((s & tst) == tst) src += " BLUETOOTH_STYLUS";
s2 &= ~tst;
@@ -107,7 +107,7 @@ public static void debugSource(int sources, String prefix) {
if ((s & tst) == tst) src += " GAMEPAD";
s2 &= ~tst;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ if (Build.VERSION.SDK_INT >= 21) {
tst = InputDevice.SOURCE_HDMI;
if ((s & tst) == tst) src += " HDMI";
s2 &= ~tst;
@@ -146,7 +146,7 @@ public static void debugSource(int sources, String prefix) {
if ((s & tst) == tst) src += " TOUCHSCREEN";
s2 &= ~tst;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+ if (Build.VERSION.SDK_INT >= 18) {
tst = InputDevice.SOURCE_TOUCH_NAVIGATION;
if ((s & tst) == tst) src += " TOUCH_NAVIGATION";
s2 &= ~tst;
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java b/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java
index cee88913f1a8..be31f80e0c6b 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java
@@ -30,7 +30,7 @@ public static void initialize() {
mAudioRecord = null;
mAudioDeviceCallback = null;
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+ if(Build.VERSION.SDK_INT >= 24)
{
mAudioDeviceCallback = new AudioDeviceCallback() {
@Override
@@ -242,7 +242,7 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat,
return null;
}
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && deviceId != 0) {
+ if (Build.VERSION.SDK_INT >= 24 && deviceId != 0) {
mAudioRecord.setPreferredDevice(getOutputAudioDeviceInfo(deviceId));
}
@@ -269,7 +269,7 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat,
return null;
}
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && deviceId != 0) {
+ if (Build.VERSION.SDK_INT >= 24 && deviceId != 0) {
mAudioTrack.setPreferredDevice(getInputAudioDeviceInfo(deviceId));
}
@@ -288,7 +288,7 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat,
}
private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ if (Build.VERSION.SDK_INT >= 24) {
AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
for (AudioDeviceInfo deviceInfo : audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
if (deviceInfo.getId() == deviceId) {
@@ -300,7 +300,7 @@ private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
}
private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ if (Build.VERSION.SDK_INT >= 24) {
AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
for (AudioDeviceInfo deviceInfo : audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
if (deviceInfo.getId() == deviceId) {
@@ -312,14 +312,14 @@ private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) {
}
private static void registerAudioDeviceCallback() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ if (Build.VERSION.SDK_INT >= 24) {
AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
}
}
private static void unregisterAudioDeviceCallback(Context context) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ if (Build.VERSION.SDK_INT >= 24) {
AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
}
@@ -338,7 +338,7 @@ private static int[] ArrayListToArray(ArrayList<Integer> integers)
* This method is called by SDL using JNI.
*/
public static int[] getAudioOutputDevices() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ if (Build.VERSION.SDK_INT >= 24) {
AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
ArrayList<Integer> arrlist = new ArrayList<Integer>();
for (AudioDeviceInfo dev : audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
@@ -358,7 +358,7 @@ public static int[] getAudioOutputDevices() {
* This method is called by SDL using JNI.
*/
public static int[] getAudioInputDevices() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ if (Build.VERSION.SDK_INT >= 24) {
AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
ArrayList<Integer> arrlist = new ArrayList<Integer>();
for (AudioDeviceInfo dev : audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
@@ -386,7 +386,7 @@ public static void audioWriteFloatBuffer(float[] buffer) {
return;
}
- if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
+ if (android.os.Build.VERSION.SDK_INT < 21) {
Log.e(TAG, "Attempted to make an incompatible audio call with uninitialized audio! (floating-point output is supported since Android 5.0 Lollipop)");
return;
}