commit 6bf6de375299db41d5510dca3321ebe42ceeb007
author Jerry Zhang <zhangjerry@google.com> Wed Mar 08 00:25:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 08 00:25:30 2017 +0000
tree 44c89119c73afe78c7a0c8737718b86cf2c6bdb3
parent 5a63f4ce647d59764ce583f7006dbf9686563d88
parent bf7c90ad0445740c77b2ee380f382d937bdd67a8

Merge "Add support for MTP_RESET_DEVICE operation." am: 52afe9d2cf
am: bf7c90ad04

Change-Id: I9401a35b6c991925d65ad4be3d55d1770f8c60db

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;