Bump minimum API level to 21

Author: cgutman

app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "org.cgutman.usbipserverforandroid"
-        minSdk 19
+        minSdk 21
         targetSdk 34
     }
 

app/src/main/java/org/cgutman/usbip/service/UsbIpService.java

@@ -342,12 +342,7 @@ private UsbDeviceInfo getInfoForDevice(UsbDevice dev, UsbDeviceConnection devCon
 		ipDev.bDeviceProtocol = (byte) dev.getDeviceProtocol();
 
 		ipDev.bConfigurationValue = 0;
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			ipDev.bNumConfigurations = (byte) dev.getConfigurationCount();
-		}
-		else {
-			ipDev.bNumConfigurations = 1;
-		}
+		ipDev.bNumConfigurations = (byte) dev.getConfigurationCount();
 
 		ipDev.bNumInterfaces = (byte) dev.getInterfaceCount();
 
@@ -371,7 +366,6 @@ private UsbDeviceInfo getInfoForDevice(UsbDevice dev, UsbDeviceConnection devCon
 			devDesc = UsbControlHelper.readDeviceDescriptor(context.devConn);
 
 			ipDev.bcdDevice = devDesc.bcdDevice;
-			ipDev.bNumConfigurations = devDesc.bNumConfigurations;
 		}
 
 		ipDev.speed = detectSpeed(dev, devDesc);

app/src/main/java/org/cgutman/usbip/usb/UsbControlHelper.java

@@ -78,25 +78,23 @@ public static boolean handleInternalControlTransfer(UsbDevice dev, UsbDeviceConn
 		value &= 0xFFFF;
 		index &= 0xFFFF;
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			if (requestType == SET_CONFIGURATION_REQUEST_TYPE && request == SET_CONFIGURATION_REQUEST) {
-				for (int i = 0; i < dev.getConfigurationCount(); i++) {
-					UsbConfiguration config = dev.getConfiguration(i);
-					if (config.getId() == value) {
-						devConn.setConfiguration(config);
-						System.out.println("Handled SET_CONFIGURATION via Android API");
-						return true;
-					}
+		if (requestType == SET_CONFIGURATION_REQUEST_TYPE && request == SET_CONFIGURATION_REQUEST) {
+			for (int i = 0; i < dev.getConfigurationCount(); i++) {
+				UsbConfiguration config = dev.getConfiguration(i);
+				if (config.getId() == value) {
+					devConn.setConfiguration(config);
+					System.out.println("Handled SET_CONFIGURATION via Android API");
+					return true;
 				}
 			}
-			else if (requestType == SET_INTERFACE_REQUEST_TYPE && request == SET_INTERFACE_REQUEST) {
-				for (int i = 0; i < dev.getInterfaceCount(); i++) {
-					UsbInterface iface = dev.getInterface(i);
-					if (iface.getId() == index && iface.getAlternateSetting() == value) {
-						devConn.setInterface(iface);
-						System.out.println("Handled SET_INTERFACE via Android API");
-						return true;
-					}
+		}
+		else if (requestType == SET_INTERFACE_REQUEST_TYPE && request == SET_INTERFACE_REQUEST) {
+			for (int i = 0; i < dev.getInterfaceCount(); i++) {
+				UsbInterface iface = dev.getInterface(i);
+				if (iface.getId() == index && iface.getAlternateSetting() == value) {
+					devConn.setInterface(iface);
+					System.out.println("Handled SET_INTERFACE via Android API");
+					return true;
 				}
 			}
 		}