From e030a090232942fbf62ffaa789401c350487d601 Mon Sep 17 00:00:00 2001 From: Wang Han Date: Thu, 30 Aug 2018 06:23:37 +0000 Subject: UsbDeviceManager: Check PTP FileDescriptor properly * A typo causes MTP one to be checked twice Change-Id: If16bf5df43b6d51f6717aa7994b2f428fb3f1a69 --- services/usb/java/com/android/server/usb/UsbDeviceManager.java | 4 ++-- 1 file 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); -- cgit v1.2.3-59-g8ed1b