diff --git a/api/system-current.txt b/api/system-current.txt index b0b6d0f97965b..61216fc74c3db 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -17586,6 +17586,7 @@ package android.hardware.usb { public class UsbManager { method public android.hardware.usb.UsbAccessory[] getAccessoryList(); method public java.util.HashMap getDeviceList(); + method public void grantPermission(android.hardware.usb.UsbDevice, java.lang.String); method public boolean hasPermission(android.hardware.usb.UsbDevice); method public boolean hasPermission(android.hardware.usb.UsbAccessory); method public android.os.ParcelFileDescriptor openAccessory(android.hardware.usb.UsbAccessory); diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index d73d3d8b04cf8..595d85715fc95 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -17,10 +17,13 @@ package android.hardware.usb; +import android.Manifest; import android.annotation.Nullable; +import android.annotation.RequiresPermission; import android.annotation.SdkConstant; -import android.annotation.SystemService; import android.annotation.SdkConstant.SdkConstantType; +import android.annotation.SystemApi; +import android.annotation.SystemService; import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; @@ -520,6 +523,8 @@ public class UsbManager { * * {@hide} */ + @SystemApi + @RequiresPermission(Manifest.permission.MANAGE_USB) public void grantPermission(UsbDevice device, String packageName) { try { int uid = mContext.getPackageManager()