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

Commit 6e6fdd47 authored by Daichi Hirono's avatar Daichi Hirono Committed by android-build-merger
Browse files

DO NOT MERGE: Fix NullPointerException in MtpManager. 

am: 9c8e0f1a

Change-Id: I0a83b1dc39015b588759e50ff16db5deaa2f6093
parents 593f9cdd 9c8e0f1a

packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java

+2 −2
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ class MtpManager { 
            }

            final MtpDeviceInfo info = mtpDevice.getDeviceInfo();

            if (info != null) {

                operationsSupported = mtpDevice.getDeviceInfo().getOperationsSupported();

                eventsSupported = mtpDevice.getDeviceInfo().getEventsSupported();

                operationsSupported = info.getOperationsSupported();

                eventsSupported = info.getEventsSupported();

            }

        } else {

            roots = new MtpRoot[0];