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

am: 6e6fdd4779 Change-Id: I83b323e21ea69b8bf51fc0c3896ef159868323ef
2016-10-18 17:48:11 +00:00
parent ca73ecfde2 6e6fdd4779
commit 0fd96a12ec
1 changed files with 2 additions and 2 deletions
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
@@ -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];