summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorDaichi Hirono <hirono@google.com>2015-12-09 04:04:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-12-09 04:04:47 +0000
commitdc89e079ced39978cf916f9b7c135da727ff40d9 (patch)
tree16b355780dcc84d67b73ffcbc5911cefedc61295 /core/java
parent3899902fe751d841e0dc6c7e5c2700bd85f4fb44 (diff)
parent4751880a4d770e8916320b5908b58f389d6552de (diff)
Merge "Grant USB device permission by using system permission."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/usb/UsbManager.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java
index a23a6cbe71fe..1e3bcd0fc796 100644
--- a/core/java/android/hardware/usb/UsbManager.java
+++ b/core/java/android/hardware/usb/UsbManager.java
@@ -23,6 +23,7 @@ import android.app.PendingIntent;
import android.content.Context;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
+import android.os.Process;
import android.os.RemoteException;
import android.util.Log;
@@ -455,6 +456,21 @@ public class UsbManager {
}
/**
+ * Grants permission for USB device without showing system dialog.
+ * Only system components can call this function.
+ * @param device to request permissions for
+ *
+ * {@hide}
+ */
+ public void grantPermission(UsbDevice device) {
+ try {
+ mService.grantDevicePermission(device, Process.myUid());
+ } catch (RemoteException e) {
+ Log.e(TAG, "RemoteException in grantPermission", e);
+ }
+ }
+
+ /**
* Returns true if the specified USB function is currently enabled when in device mode.
* <p>
* USB functions represent interfaces which are published to the host to access