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

Commit a4b1fe65 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 

am: e419713d

Change-Id: Ie1c573d76c863684df360735d94796e7f0336cb6
parents e42a94ea e419713d

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

+2 −1
Original line number Diff line number Diff line
@@ -540,7 +540,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
            // 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(