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

Merge "UsbDeviceManager: Check PTP FileDescriptor properly" am: a0a67862aa

Browse Source 
am: 353543639f

Change-Id: Iefce26ffbfe22f56fe47a807ba5ed52e6f072d00
This commit is contained in:
Philip P. Moltmann
2018-08-30 12:48:08 -07:00
committed by android-build-merger
parent 8107e81a78 353543639f
commit 8ccef1b9f3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -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);