Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add missing Nullable annotations to UsbDeviceConnection.controlTransfer." am: a7e060a986 am: 0b82504ab6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2383855

Change-Id: I168b4e377db855f9b3cd7c971315443d4d663323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateus Azis
2023-03-27 20:30:49 +00:00
committed by Automerger Merge Worker
parent 590b5a3dad 0b82504ab6
commit 99b584f0ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -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();

4
core/java/android/hardware/usb/UsbDeviceConnection.java
View File

@@ -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);