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

Commit 826fe598 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921669

Change-Id: I06e3e7be6dad6dfa84d5b756ce33e35af8316adf
parents cdb5f00f 0a0ddada

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/hardware/usb/UsbManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,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 {

services/usb/java/com/android/server/usb/UsbService.java

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