From 311ae829c77df3ba7ac7fefcda39ee46086a0b1b Mon Sep 17 00:00:00 2001
From: Sylvain Becker <sylvain.becker@gmail.com>
Date: Wed, 28 Oct 2020 14:03:05 +0100
Subject: [PATCH] Android: keep compatibility with older JDK

---
 .../src/main/java/org/libsdl/app/SDLActivity.java    |  4 ++--
 .../java/org/libsdl/app/SDLControllerManager.java    | 12 ++++++------
 2 files changed, 8 insertions(+), 8 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 3e7af8c5b0a22..e7e5a2ac74012 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
@@ -198,7 +198,7 @@ public static void initialize() {
         mTextEdit = null;
         mLayout = null;
         mClipboardHandler = null;
-        mCursors = new Hashtable<>();
+        mCursors = new Hashtable<Integer, PointerIcon>();
         mLastCursorID = 0;
         mSDLThread = null;
         mIsResumedCalled = false;
@@ -1369,7 +1369,7 @@ public void onDismiss(DialogInterface unused) {
         int[] buttonIds = args.getIntArray("buttonIds");
         String[] buttonTexts = args.getStringArray("buttonTexts");
 
-        final SparseArray<Button> mapping = new SparseArray<>();
+        final SparseArray<Button> mapping = new SparseArray<Button>();
 
         LinearLayout buttons = new LinearLayout(this);
         buttons.setOrientation(LinearLayout.HORIZONTAL);
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java b/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
index 5ad172cc83659..05e0f0cac7e72 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
@@ -176,7 +176,7 @@ public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
 
     public SDLJoystickHandler_API16() {
 
-        mJoysticks = new ArrayList<>();
+        mJoysticks = new ArrayList<SDLJoystick>();
     }
 
     @Override
@@ -192,8 +192,8 @@ public void pollInputDevices() {
                     joystick.device_id = device_id;
                     joystick.name = joystickDevice.getName();
                     joystick.desc = getJoystickDescriptor(joystickDevice);
-                    joystick.axes = new ArrayList<>();
-                    joystick.hats = new ArrayList<>();
+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
+                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
 
                     List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
                     Collections.sort(ranges, new RangeComparator());
@@ -225,7 +225,7 @@ public void pollInputDevices() {
             }
             if (i == deviceIds.length) {
                 if (removedDevices == null) {
-                    removedDevices = new ArrayList<>();
+                    removedDevices = new ArrayList<Integer>();
                 }
                 removedDevices.add(device_id);
             }
@@ -447,7 +447,7 @@ static class SDLHaptic {
     private final ArrayList<SDLHaptic> mHaptics;
 
     public SDLHapticHandler() {
-        mHaptics = new ArrayList<>();
+        mHaptics = new ArrayList<SDLHaptic>();
     }
 
     public void run(int device_id, float intensity, int length) {
@@ -521,7 +521,7 @@ public void pollHapticDevices() {
             if (device_id != deviceId_VIBRATOR_SERVICE || !hasVibratorService) {
                 if (i == deviceIds.length) {
                     if (removedDevices == null) {
-                        removedDevices = new ArrayList<>();
+                        removedDevices = new ArrayList<Integer>();
                     }
                     removedDevices.add(device_id);
                 }