diff options
| author | 2018-10-08 01:36:48 -0700 | |
|---|---|---|
| committer | 2018-10-08 01:36:48 -0700 | |
| commit | a4b1fe65470ea4c015207fa8b2016d95603e5931 (patch) | |
| tree | e635e8cb2245c73a1987af625beec263c5b7786e | |
| parent | e42a94ea3e65d6ad71bbf5ff59ae67e80b0c9f21 (diff) | |
| parent | e419713dc85aafb21ed411f1d36b31b95f8aa62a (diff) | |
Merge "Fix UsbDeviceManager null object reference" am: 9b1db24f6e am: ec5dd5f1dd
am: e419713dc8
Change-Id: Ie1c573d76c863684df360735d94796e7f0336cb6
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 57f166889b85..7e184eb90a3c 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -540,7 +540,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser // We do not show the USB notification if the primary volume supports mass storage. // The legacy mass storage UI will be used instead. final StorageManager storageManager = StorageManager.from(mContext); - final StorageVolume primary = storageManager.getPrimaryVolume(); + final StorageVolume primary = + storageManager != null ? storageManager.getPrimaryVolume() : null; boolean massStorageSupported = primary != null && primary.allowMassStorage(); mUseUsbNotification = !massStorageSupported && mContext.getResources().getBoolean( |