Remove inner class ServicePermissionUtil in AndroidTool

Author: JulianKast

android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java

@@ -35,7 +35,7 @@ public void onSdlEnabled(Context context, Intent intent) {
             PendingIntent pendingIntent = (PendingIntent) intent.getParcelableExtra(TransportConstants.PENDING_INTENT_EXTRA);
             if (pendingIntent != null) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    if (!AndroidTools.ServicePermissionUtil.hasForegroundServiceTypePermission(context)) {
+                    if (!AndroidTools.hasForegroundServiceTypePermission(context)) {
                         requestUsbAccessory(context);
                         storedIntent = intent;
                         storedContext = context;
@@ -82,7 +82,7 @@ public String getSdlServiceName() {
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (ACTION_USB_PERMISSION.equals(action) && storedContext != null && storedIntent != null && pendingIntent != null) {
-                if (AndroidTools.ServicePermissionUtil.hasForegroundServiceTypePermission(storedContext)) {
+                if (AndroidTools.hasForegroundServiceTypePermission(storedContext)) {
                     try {
                         pendingIntent.send(storedContext, 0, storedIntent);
                     } catch (PendingIntent.CanceledException e) {

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java

@@ -864,7 +864,7 @@ public void handleMessage(Message msg) {
                     if (parcelFileDescriptor != null) {
                         // Added requirements with Android 14, Checking if we have proper permission to enter the foreground for Foreground service type connectedDevice.
                         // If we do not have permission to enter the Foreground, we pass off hosting the RouterService to another app.
-                        if (!AndroidTools.ServicePermissionUtil.hasForegroundServiceTypePermission(service.getApplicationContext())) {
+                        if (!AndroidTools.hasForegroundServiceTypePermission(service.getApplicationContext())) {
                             service.deployNextRouterService(parcelFileDescriptor);
                             acknowledgeUSBAccessoryReceived(msg);
                             return;

android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java

@@ -397,30 +397,30 @@ public static void saveVehicleType(Context context, VehicleType vehicleType, Str
         }
     }
 
-    public static class ServicePermissionUtil {
-        public static boolean hasUsbAccessoryPermission(Context context) {
-            UsbManager manager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
-            if (manager == null || manager.getAccessoryList() == null) {
-                return false;
-            }
-            for (final UsbAccessory usbAccessory : manager.getAccessoryList()) {
-                if (manager.hasPermission(usbAccessory)) {
-                    return true;
-                }
-            }
+    public static boolean hasUsbAccessoryPermission(Context context) {
+        UsbManager manager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
+        if (manager == null || manager.getAccessoryList() == null) {
             return false;
         }
-
-        public static boolean checkPermission(Context applicationContext, String permission) {
-            return PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(applicationContext, permission);
-        }
-
-        public static boolean hasForegroundServiceTypePermission(Context context) {
-            // if Build is less than Android 14, we don't need either permission to enter the foreground.
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+        for (final UsbAccessory usbAccessory : manager.getAccessoryList()) {
+            if (manager.hasPermission(usbAccessory)) {
                 return true;
             }
-            return ServicePermissionUtil.checkPermission(context, Manifest.permission.BLUETOOTH_CONNECT) || ServicePermissionUtil.hasUsbAccessoryPermission(context);
         }
+        return false;
+    }
+
+    public static boolean checkPermission(Context applicationContext, String permission) {
+        return PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(applicationContext, permission);
+    }
+
+    public static boolean hasForegroundServiceTypePermission(Context context) {
+        // if Build is less than Android 14, we don't need either permission to enter the
+        // foreground.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            return true;
+        }
+        return checkPermission(context,
+                Manifest.permission.BLUETOOTH_CONNECT) || hasUsbAccessoryPermission(context);
     }
 }