commit a708f5b22a88cebd0cbce1a0f3758859e4ffadff
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 06 19:30:03 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 06 19:30:03 2015 -0800
tree 28fdae691ba61e819824053341c494f5f0b52b40
parent 4ea05490a5f2e4e3e3f5570c3071b02e7c9b7c86
parent 1799cb4eeb8728431d3cdb02b0dba98f7a2ad364

Merge "QService: Fix binder out-parcel position as well"

libqservice/QService.cpp

diff --git a/libqservice/QService.cpp b/libqservice/QService.cpp
index 5276695..ddb4b18 100644
--- a/libqservice/QService.cpp
+++ b/libqservice/QService.cpp
@@ -64,11 +64,15 @@
     status_t err = (status_t) FAILED_TRANSACTION;
     IPCThreadState* ipc = IPCThreadState::self();
     //Rewind parcel in case we're calling from the same process
-    if (ipc->getCallingPid() == getpid())
+    bool sameProcess = (ipc->getCallingPid() == getpid());
+    if(sameProcess)
         inParcel->setDataPosition(0);
     if (mClient.get()) {
         ALOGD_IF(QSERVICE_DEBUG, "Dispatching command: %d", command);
         err = mClient->notifyCallback(command, inParcel, outParcel);
+        //Rewind parcel in case we're calling from the same process
+        if (sameProcess)
+            outParcel->setDataPosition(0);
     }
     return err;
 }