DO NOT MERGE: Fix NullPointerException in MtpManager.

am: 9c8e0f1a54 Change-Id: I0a83b1dc39015b588759e50ff16db5deaa2f6093
2016-10-18 17:35:21 +00:00
parent 593f9cdde0 9c8e0f1a54
commit 6e6fdd4779
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];