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

Commit 997eafcb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose grantPermission via systemApi."

parents 54a6ee28 f3189e68

api/system-current.txt

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

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

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