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

DO NOT MERGE: Fix NullPointerException in MtpManager. am: 9c8e0f1a54

Browse Source 
am: 6e6fdd4779

Change-Id: I83b323e21ea69b8bf51fc0c3896ef159868323ef
This commit is contained in:
Daichi Hirono
2016-10-18 17:48:11 +00:00
committed by android-build-merger
parent ca73ecfde2 6e6fdd4779
commit 0fd96a12ec
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];