Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix usb not working for work profile

Browse Source 
Fixes: 148283143
Test: Manual
Change-Id: Ib478b57e58bd162da92cf3e1829d05f4943c0be1
This commit is contained in:
Evan Severson
2020-01-24 10:03:32 -08:00
parent 414e1576d6
commit 64a3827f3a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/usb/java/com/android/server/usb/UsbPermissionManager.java
View File

@@ -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;

6
services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
View File

@@ -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) {