diff options
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/usb/UsbDeviceConnection.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index b243374878fc..ee571b3b485a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -18727,8 +18727,8 @@ package android.hardware.usb { method public int bulkTransfer(android.hardware.usb.UsbEndpoint, byte[], int, int, int); method public boolean claimInterface(android.hardware.usb.UsbInterface, boolean); method public void close(); - method public int controlTransfer(int, int, int, int, byte[], int, int); - method public int controlTransfer(int, int, int, int, byte[], int, int, int); + method public int controlTransfer(int, int, int, int, @Nullable byte[], int, int); + method public int controlTransfer(int, int, int, int, @Nullable byte[], int, int, int); method public int getFileDescriptor(); method public byte[] getRawDescriptors(); method public String getSerial(); diff --git a/core/java/android/hardware/usb/UsbDeviceConnection.java b/core/java/android/hardware/usb/UsbDeviceConnection.java index 7c2e518b8544..44144d92f56a 100644 --- a/core/java/android/hardware/usb/UsbDeviceConnection.java +++ b/core/java/android/hardware/usb/UsbDeviceConnection.java @@ -238,7 +238,7 @@ public class UsbDeviceConnection { * or negative value for failure */ public int controlTransfer(int requestType, int request, int value, - int index, byte[] buffer, int length, int timeout) { + int index, @Nullable byte[] buffer, int length, int timeout) { return controlTransfer(requestType, request, value, index, buffer, 0, length, timeout); } @@ -263,7 +263,7 @@ public class UsbDeviceConnection { * or negative value for failure */ public int controlTransfer(int requestType, int request, int value, int index, - byte[] buffer, int offset, int length, int timeout) { + @Nullable byte[] buffer, int offset, int length, int timeout) { checkBounds(buffer, offset, length); return native_control_request(requestType, request, value, index, buffer, offset, length, timeout); |