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

Merge "Expose grantPermission via systemApi."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-18 17:05:19 +00:00
committed by Android (Google) Code Review
parent 54a6ee28d0 f3189e6836
commit 997eafcbf2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -17586,6 +17586,7 @@ package android.hardware.usb {
public class UsbManager {
method public android.hardware.usb.UsbAccessory[] getAccessoryList();
method public java.util.HashMap<java.lang.String, android.hardware.usb.UsbDevice> 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);

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

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