Merge branch 'dev' into strings-squashed

This commit is contained in:
alansley 2024-07-30 08:16:02 +10:00
commit 79cd87878c

View File

@ -22,7 +22,7 @@ public class MemoryFileUtil {
int fd = field.getInt(fileDescriptor); int fd = field.getInt(fileDescriptor);
return ParcelFileDescriptor.adoptFd(fd); return ParcelFileDescriptor.fromFd(fd);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new IOException(e); throw new IOException(e);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {