From f3189e6836a0674cbaa0da6bb233d68c0c6f1e7c Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Wed, 16 Aug 2017 16:04:24 -0700
Subject: [PATCH] Expose grantPermission via systemApi.

Test: none
Bug: 64200118
Change-Id: I9aad9959a48fb5dfb31114145c19cae1128cc33c
---
 api/system-current.txt                         | 1 +
 core/java/android/hardware/usb/UsbManager.java | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index ac9da2027d2c0..a31231ddc5b35 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<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);
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()