Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix UsbDeviceManager null object reference" am: 9b1db24f6e

Browse Source 
am: ec5dd5f1dd

Change-Id: Ib95d75c80af12db8bb617df5ce0bcc0cd6c6c028
This commit is contained in:
Eddie Hung
2018-10-08 01:24:08 -07:00
committed by android-build-merger
parent 41535c78be ec5dd5f1dd
commit e419713dc8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -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(