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

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

Merge "Fix usb not working for work profile"

parents 06b1d062 64a3827f

services/usb/java/com/android/server/usb/UsbPermissionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ class UsbPermissionManager { 
        synchronized (mPermissionsByUser) {

            UsbUserPermissionManager permissions = mPermissionsByUser.get(userId);

            if (permissions == null) {

                permissions = new UsbUserPermissionManager(mContext, UserHandle.of(userId),

                        mUsbService.getSettingsForUser(userId));

                permissions = new UsbUserPermissionManager(mContext.createContextAsUser(

                        UserHandle.of(userId), 0), mUsbService.getSettingsForUser(userId));

                mPermissionsByUser.put(userId, permissions);

            }

            return permissions;

services/usb/java/com/android/server/usb/UsbUserPermissionManager.java

+3 −3
Original line number Diff line number Diff line
@@ -109,16 +109,16 @@ class UsbUserPermissionManager { 
    @GuardedBy("mLock")

    private boolean mIsCopyPermissionsScheduled;



    UsbUserPermissionManager(@NonNull Context context, @NonNull UserHandle user,

    UsbUserPermissionManager(@NonNull Context context,

            @NonNull UsbUserSettingsManager usbUserSettingsManager) {

        mContext = context;

        mUser = user;

        mUser = context.getUser();

        mUsbUserSettingsManager = usbUserSettingsManager;

        mDisablePermissionDialogs = context.getResources().getBoolean(

                com.android.internal.R.bool.config_disableUsbPermissionDialogs);



        mPermissionsFile = new AtomicFile(new File(

                Environment.getUserSystemDirectory(user.getIdentifier()),

                Environment.getUserSystemDirectory(mUser.getIdentifier()),

                "usb_permissions.xml"), "usb-permissions");



        synchronized (mLock) {