Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-18 17:29:43 +00:00
committed by Android (Google) Code Review
parent fe7cab6042 9c8e0f1a54
commit dd443a0548
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
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];