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

Commit ab87b44d authored by Eddie Hung's avatar Eddie Hung Committed by Isaac Lee
Browse files

Fix UsbDeviceManager null object reference 

STORAGE_SERVICE is not ready or not available to use.
UsbDeviceManager will get null value and cause null object
reference exception. Check return value before use.

Test: No exception when start USBService
Change-Id: Icdbc532894d3ca1548f327d9f63d495baa549c68
parent bc5c593e

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(