diff options
| author | 2018-10-08 01:24:08 -0700 | |
|---|---|---|
| committer | 2018-10-08 01:24:08 -0700 | |
| commit | e419713dc85aafb21ed411f1d36b31b95f8aa62a (patch) | |
| tree | 8548e5aab84a8cee39d9fe50169bfe2049f12a4a | |
| parent | 41535c78be0cd7f62ab01b6a47e72b2c8a431eaf (diff) | |
| parent | ec5dd5f1ddcb860f8bd3d057edee9dbd08c61f5b (diff) | |
Merge "Fix UsbDeviceManager null object reference" am: 9b1db24f6e
am: ec5dd5f1dd
Change-Id: Ib95d75c80af12db8bb617df5ce0bcc0cd6c6c028
| -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 36f8063cca52..4da7285bcf2d 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -539,7 +539,8 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver // 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( |