Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf4ea753 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "UsbDeviceManager: Check PTP FileDescriptor properly" am: a0a67862 am: 35354363 

am: 8ccef1b9

Change-Id: I70df6ac9cf0c39d4c59bbe79c18388dbe23419c2
parents 91f15340 8ccef1b9

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
        }

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