commit 59a90609cc340d2933c119aa47045a5c95530b48
author Daichi Hirono <hirono@google.com> Mon Jan 11 13:36:57 2016 +0900
committer Daichi Hirono <hirono@google.com> Tue Jan 12 12:06:46 2016 +0900
tree 901a72751f1ec72bf3f9b56dc9f26e34fffbe3e6
parent 4a9fc960b75e0718193d0df91936b6c6bd4195ae

Reland "Return parameters of event as well as event code."

The CL was previously reviewed at ag/842911.

> The CL makes MtpDevice#reapEvent return event parameters as well as
> event code.
>
> BUG=26480986

Change-Id: Ie750a58248068cd0e804f20b57e7e86eef19d315

media/mtp/MtpDevice.cpp

diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp
index 30843a7..6f72a3e 100644
--- a/media/mtp/MtpDevice.cpp
+++ b/media/mtp/MtpDevice.cpp
@@ -866,15 +866,19 @@
     return currentHandle;
 }
 
-int MtpDevice::reapEventRequest(int handle) {
+int MtpDevice::reapEventRequest(int handle, uint32_t (*parameters)[3]) {
     Mutex::Autolock autoLock(mEventMutex);
-    if (!mProcessingEvent || mCurrentEventHandle != handle) {
+    if (!mProcessingEvent || mCurrentEventHandle != handle || !parameters) {
         return -1;
     }
     mProcessingEvent = false;
     const int readSize = mEventPacket.readResponse(mRequestIntr->dev);
     const int result = mEventPacket.getEventCode();
-    return readSize == 0 ? 0 : result;
+    // MTP event has three parameters.
+    (*parameters)[0] = mEventPacket.getParameter(1);
+    (*parameters)[1] = mEventPacket.getParameter(2);
+    (*parameters)[2] = mEventPacket.getParameter(3);
+    return readSize != 0 ? result : 0;
 }
 
 void MtpDevice::discardEventRequest(int handle) {