diff options
| author | 2018-10-08 01:10:46 -0700 | |
|---|---|---|
| committer | 2018-10-08 01:10:46 -0700 | |
| commit | ec5dd5f1ddcb860f8bd3d057edee9dbd08c61f5b (patch) | |
| tree | 14ce5fa33b25426b1f75ee8b97e356bbbf83ead3 | |
| parent | c7d6900e49369174a7f2ff017ede07607b7e5687 (diff) | |
| parent | 9b1db24f6e0ce1bea68a834d5ea21bea0f9bf374 (diff) | |
Merge "Fix UsbDeviceManager null object reference"
am: 9b1db24f6e
Change-Id: I70cb3a014eb19ee6214f4590d50e705ab4b9130f
| -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( |