summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wang Han <wanghan1995315@gmail.com> 2018-08-30 06:23:37 +0000
committer Wang Han <wanghan1995315@gmail.com> 2018-08-30 06:28:36 +0000
commite030a090232942fbf62ffaa789401c350487d601 (patch)
tree1be5f9daad82f0ae05be065d9a789826f0a06b5f
parentb825510b80a6d8db12590f2f0995bddf97970946 (diff)
UsbDeviceManager: Check PTP FileDescriptor properly
* A typo causes MTP one to be checked twice Change-Id: If16bf5df43b6d51f6717aa7994b2f428fb3f1a69
-rw-r--r--services/usb/java/com/android/server/usb/UsbDeviceManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 9f8042c844de..36f8063cca52 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -279,8 +279,8 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver
}
mControlFds.put(UsbManager.FUNCTION_MTP, mtpFd);
FileDescriptor ptpFd = nativeOpenControl(UsbManager.USB_FUNCTION_PTP);
- if (mtpFd == null) {
- Slog.e(TAG, "Failed to open control for mtp");
+ if (ptpFd == null) {
+ Slog.e(TAG, "Failed to open control for ptp");
}
mControlFds.put(UsbManager.FUNCTION_PTP, ptpFd);