commit c30414329c381afba7bd23bdd0f1237fad0850a6
author Kenny Root <kroot@google.com> Mon Oct 11 17:43:05 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 11 17:43:05 2010 -0700
tree 521e9a52dab799e79172cae8e9dca70dc183a615
parent 8bb7a1dfbb43dda49fb3c4f86181bcd7f969a832
parent de846ac659e8c14d898a3fa14bd0504b24096057

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

Merge commit 'de846ac659e8c14d898a3fa14bd0504b24096057' into gingerbread-plus-aosp

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

libs/storage/IMountService.cpp

diff --git a/libs/storage/IMountService.cpp b/libs/storage/IMountService.cpp
index f36e2a3..9ff6930 100644
--- a/libs/storage/IMountService.cpp
+++ b/libs/storage/IMountService.cpp
@@ -449,12 +449,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;