Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e419713d authored by Eddie Hung's avatar Eddie Hung Committed by android-build-merger
Browse files

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

am: ec5dd5f1

Change-Id: Ib95d75c80af12db8bb617df5ce0bcc0cd6c6c028
parents 41535c78 ec5dd5f1

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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(