Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52d82371 authored by Mateus Azis's avatar Mateus Azis
Browse files

Add missing Nullable annotations to UsbDeviceConnection.controlTransfer. 

The Javadoc already states that 'buffer' can be null.

Test: N/A, no functional change.
Change-Id: I55634f58a7f2aa4f6c0b8157798e2ade27cf75dc
parent 2051907a

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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();

core/java/android/hardware/usb/UsbDeviceConnection.java

+2 −2
Original line number Diff line number Diff line
@@ -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);