Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev

This commit is contained in:
TreeHugger Robot
2016-10-18 17:29:43 +00:00
committed by Android (Google) Code Review

View File

@@ -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];