diff options
| author | 2018-10-08 07:44:48 +0000 | |
|---|---|---|
| committer | 2018-10-08 07:44:48 +0000 | |
| commit | 9b1db24f6e0ce1bea68a834d5ea21bea0f9bf374 (patch) | |
| tree | af02f877e6c577c5c422dbbdb9cbf31093ebe979 | |
| parent | 2d82493ded10d88cb44e84b90a1b485d3a895d75 (diff) | |
| parent | ab87b44dca7ccf9c5f48bc9daebf9edf94a1f390 (diff) | |
Merge "Fix UsbDeviceManager null object reference"
| -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( |