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

Commit df296a7e authored by Johan T. Halseth's avatar Johan T. Halseth Committed by android-build-merger
Browse files

Merge "Adding grantPermission for packageName" into nyc-mr1-dev 

am: b1f0e970

* commit 'b1f0e970':
  Adding grantPermission for packageName

Change-Id: I59b23547464b776977b69ffba1ad544fc124ef0e
parents 1bbc2a1f b1f0e970

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

+21 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.internal.util.Preconditions; 




import android.app.PendingIntent;

import android.app.PendingIntent;

import android.content.Context;

import android.content.Context;

import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Bundle;

import android.os.Bundle;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor;

import android.os.Process;

import android.os.Process;
@@ -475,6 +476,26 @@ public class UsbManager { 
        }

        }

    }

    }





    /**

     * Grants permission to specified package for USB device without showing system dialog.

     * Only system components can call this function, as it requires the MANAGE_USB permission.

     * @param device to request permissions for

     * @param packageName of package to grant permissions

     *

     * {@hide}

     */

    public void grantPermission(UsbDevice device, String packageName) {

        try {

            int uid = mContext.getPackageManager()

                .getPackageUidAsUser(packageName, mContext.getUserId());

            mService.grantDevicePermission(device, uid);

        } catch (NameNotFoundException e) {

            Log.e(TAG, "Package " + packageName + " not found.", e);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

    /**

     * Returns true if the specified USB function is currently enabled when in device mode.

     * Returns true if the specified USB function is currently enabled when in device mode.

     * <p>

     * <p>