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

Commit 6bf6de37 authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

Merge "Add support for MTP_RESET_DEVICE operation." am: 52afe9d2 

am: bf7c90ad

Change-Id: I9401a35b6c991925d65ad4be3d55d1770f8c60db
parents 5a63f4ce bf7c90ad

media/mtp/MtpServer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static const MtpOperationCode kSupportedOperationCodes[] = { 
    MTP_OPERATION_SEND_OBJECT,

//    MTP_OPERATION_INITIATE_CAPTURE,

//    MTP_OPERATION_FORMAT_STORE,

//    MTP_OPERATION_RESET_DEVICE,

    MTP_OPERATION_RESET_DEVICE,

//    MTP_OPERATION_SELF_TEST,

//    MTP_OPERATION_SET_OBJECT_PROTECTION,

//    MTP_OPERATION_POWER_DOWN,
@@ -362,6 +362,7 @@ bool MtpServer::handleRequest() { 
        case MTP_OPERATION_OPEN_SESSION:

            response = doOpenSession();

            break;

        case MTP_OPERATION_RESET_DEVICE:

        case MTP_OPERATION_CLOSE_SESSION:

            response = doCloseSession();

            break;