commit fd14fb59584a3670a676ca014ba74f788734dfeb
author Kenny Root <kroot@google.com> Wed Oct 13 15:58:59 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 13 15:58:59 2010 -0700
tree 630302d285f4eb37b1a8c6ce64e51696ec9389ea
parent 0a9b54e88b9cbb30748b5f0b331aec3f3ef8d639
parent c30414329c381afba7bd23bdd0f1237fad0850a6

am c3041432: am de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread

Merge commit 'c30414329c381afba7bd23bdd0f1237fad0850a6'

* commit 'c30414329c381afba7bd23bdd0f1237fad0850a6':
  Change to new binder implementation for OBB

libs/storage/IMountService.cpp

diff --git a/libs/storage/IMountService.cpp b/libs/storage/IMountService.cpp
index 9d3749d..b5f9c47 100644
--- a/libs/storage/IMountService.cpp
+++ b/libs/storage/IMountService.cpp
@@ -450,12 +450,15 @@
         }
     }
 
-    void unmountObb(const String16& filename, const bool force)
+    void unmountObb(const String16& filename, const bool force,
+            const sp<IObbActionListener>& token, const int32_t nonce)
     {
         Parcel data, reply;
         data.writeInterfaceToken(IMountService::getInterfaceDescriptor());
         data.writeString16(filename);
         data.writeInt32(force ? 1 : 0);
+        data.writeStrongBinder(token->asBinder());
+        data.writeInt32(nonce);
         if (remote()->transact(TRANSACTION_unmountObb, data, &reply) != NO_ERROR) {
             LOGD("unmountObb could not contact remote\n");
             return;