v1.11: Android 13 crash fix / AGP 8.1.0 / build configuration update

README.md

@@ -10,6 +10,7 @@ Device enumeration and hot plug/unplug events are supported.
 To be used with **green-green-avk/libusb**:
 
 Branches:
+
 * <kbd>[v1.0.23-android-libusbmanager](https://github.com/green-green-avk/libusb/tree/v1.0.23-android-libusbmanager)</kbd>
 * <kbd>[v1.0.26-android-libusbmanager](https://github.com/green-green-avk/libusb/tree/v1.0.26-android-libusbmanager)</kbd>
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,6 +19,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

libusbmanager/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'com.github.green-green-avk'
-version = '1.10'
+version = '1.11'
 
 android {
     namespace 'green_green_avk.libusbmanager'
@@ -34,21 +34,22 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.5.0'
 }
 
-task javadoc(type: Javadoc) {
+tasks.register('javadoc', Javadoc) {
     failOnError true
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     options {
         addStringOption('link', 'https://developer.android.com/reference')
     }
-    android.libraryVariants.all { variant ->
+    android.libraryVariants.configureEach { variant ->
         if (variant.name == 'release') {
             owner.classpath += variant.javaCompileProvider.get().classpath
         }
     }
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+tasks.register('javadocJar', Jar) {
+    dependsOn javadoc
     archiveClassifier.set 'javadoc'
     from javadoc.destinationDir
 }

libusbmanager/src/main/java/green_green_avk/libusbmanager/LibUsbManager.java

@@ -245,10 +245,20 @@ private void client(@NonNull final LocalSocket socket) {
             if (devConn == null)
                 throw new ProcessException(context.getString(
                         R.string.libusbmanager_msg_unable_to_open_device_s, devName));
-            socket.setFileDescriptorsForSend(new FileDescriptor[]{
-                    ParcelFileDescriptor.adoptFd(devConn.getFileDescriptor()).getFileDescriptor()
-            });
-            socket.getOutputStream().write(0);
+            // We need to `dup()` here: stupid `ParcelFileDescriptor.adoptFd()` semantics...
+            // It was possible to use it though before `fdsan` went such aggressive
+            // in Android 13.
+            // I prefer not go native to resolve it rightly for the sake of the library size.
+            final ParcelFileDescriptor devFd =
+                    ParcelFileDescriptor.fromFd(devConn.getFileDescriptor());
+            try {
+                socket.setFileDescriptorsForSend(new FileDescriptor[]{
+                        devFd.getFileDescriptor()
+                });
+                socket.getOutputStream().write(0);
+            } finally {
+                devFd.close();
+            }
             while (cis.read() != -1) ; // Wait for closing by the client...
         } catch (final InterruptedIOException ignored) {
         } catch (final SecurityException | IOException |