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

Merge "Fix UsbDeviceManager null object reference"

Browse Source
This commit is contained in:
Treehugger Robot
2018-10-08 07:44:48 +00:00
committed by Gerrit Code Review
parent 2d82493ded ab87b44dca
commit 9b1db24f6e
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. // We do not show the USB notification if the primary volume supports mass storage.
// The legacy mass storage UI will be used instead. // The legacy mass storage UI will be used instead.
final StorageManager storageManager = StorageManager.from(mContext); 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(); boolean massStorageSupported = primary != null && primary.allowMassStorage();
mUseUsbNotification = !massStorageSupported && mContext.getResources().getBoolean( mUseUsbNotification = !massStorageSupported && mContext.getResources().getBoolean(