DO NOT MERGE: Fix NullPointerException in MtpManager.

am: 9c8e0f1a54

Change-Id: I0a83b1dc39015b588759e50ff16db5deaa2f6093
This commit is contained in:
Daichi Hirono
2016-10-18 17:35:21 +00:00
committed by android-build-merger

View File

@@ -282,8 +282,8 @@ class MtpManager {
} }
final MtpDeviceInfo info = mtpDevice.getDeviceInfo(); final MtpDeviceInfo info = mtpDevice.getDeviceInfo();
if (info != null) { if (info != null) {
operationsSupported = mtpDevice.getDeviceInfo().getOperationsSupported(); operationsSupported = info.getOperationsSupported();
eventsSupported = mtpDevice.getDeviceInfo().getEventsSupported(); eventsSupported = info.getEventsSupported();
} }
} else { } else {
roots = new MtpRoot[0]; roots = new MtpRoot[0];