diff options
| author | Evan Severson <evanseverson@google.com> | 2020-01-24 10:03:32 -0800 |
|---|---|---|
| committer | Evan Severson <evanseverson@google.com> | 2020-01-24 10:03:32 -0800 |
| commit | 64a3827f3a0a6434b3380fdb627e41281964a46a (patch) | |
| tree | 949ec5e63da76d3dc916746a5aaabce692b449c3 | |
| parent | 414e1576d6943af62f5802fa4656f1c099a9ca3b (diff) | |
Fix usb not working for work profile
Fixes: 148283143
Test: Manual
Change-Id: Ib478b57e58bd162da92cf3e1829d05f4943c0be1
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbPermissionManager.java | 4 | ||||
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbUserPermissionManager.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbPermissionManager.java b/services/usb/java/com/android/server/usb/UsbPermissionManager.java index 1e46f981f117..5d3ed4fc6acf 100644 --- a/services/usb/java/com/android/server/usb/UsbPermissionManager.java +++ b/services/usb/java/com/android/server/usb/UsbPermissionManager.java @@ -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; diff --git a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java index 2a94393b8009..333edfd91b16 100644 --- a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java +++ b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java @@ -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) { |