commit 52afe9d2cf7bf85eace3f928716030f39a5c6e21
author Jerry Zhang <zhangjerry@google.com> Wed Mar 08 00:18:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 08 00:18:32 2017 +0000
tree 4d1fb7bf5b1aa258297bcd925e938d4268e96e64
parent 1df67b1b3a1a06d4a74a091345bd74045fe5bb82
parent 6dafeccb9c82e2b1328f36fbce1b26e7799b1100

Merge "Add support for MTP_RESET_DEVICE operation."

media/mtp/MtpServer.cpp

diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index 5a1d6dc..88dabff 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -54,7 +54,7 @@
     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 @@
         case MTP_OPERATION_OPEN_SESSION:
             response = doOpenSession();
             break;
+        case MTP_OPERATION_RESET_DEVICE:
         case MTP_OPERATION_CLOSE_SESSION:
             response = doCloseSession();
             break;