usb: Address some API review comments

- Add the missing annotation for the permission in UsbService
- Enforce the permission in UsbManager

Test: atest CtsUsbManagerTestCases
Bug: 179389205
Change-Id: I9cb3a0f24367f0b28417588e03db882db159f7a7
This commit is contained in:
Ray Chi
2021-03-18 17:40:35 +08:00
parent 7037802648
commit 5603742b00
3 changed files with 4 additions and 2 deletions

View File

@@ -90,7 +90,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

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 {

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