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

Merge "usb: Address some API review comments" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-09 05:14:47 +00:00
committed by Android (Google) Code Review
parent 5b44b784be 5603742b00
commit 0a0ddadab5
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/module-lib-current.txt
View File

@@ -79,7 +79,7 @@ package android.hardware.usb {
public class UsbManager {
method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public int getGadgetHalVersion();
method public int getUsbBandwidth();
method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public int getUsbBandwidthMbps();
method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public int getUsbHalVersion();
field public static final int GADGET_HAL_NOT_SUPPORTED = -1; // 0xffffffff
field public static final int GADGET_HAL_V1_0 = 10; // 0xa

3
core/java/android/hardware/usb/UsbManager.java
View File

@@ -1093,7 +1093,8 @@ public class UsbManager {
* {@hide}
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public int getUsbBandwidth() {
@RequiresPermission(Manifest.permission.MANAGE_USB)
public int getUsbBandwidthMbps() {
int usbSpeed;
try {

1
services/usb/java/com/android/server/usb/UsbService.java
View File

@@ -639,6 +639,7 @@ public class UsbService extends IUsbManager.Stub {
@Override
public int getCurrentUsbSpeed() {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null);
Preconditions.checkNotNull(mDeviceManager, "DeviceManager must not be null");
final long ident = Binder.clearCallingIdentity();