diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-25 17:52:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-25 17:52:14 -0700 |
| commit | 6e065a729dbf08f99209a7710da80442a394ec0d (patch) | |
| tree | 5017ecb5a8eff2385a0fff4bcae0bbd2c03cac58 /libs | |
| parent | b4693e25b1a576718eb669a74a056b3f1e451117 (diff) | |
| parent | 4fbbda4cecb078bd3867f416b02cc75f5455284f (diff) | |
| download | frameworks_base-6e065a729dbf08f99209a7710da80442a394ec0d.zip frameworks_base-6e065a729dbf08f99209a7710da80442a394ec0d.tar.gz frameworks_base-6e065a729dbf08f99209a7710da80442a394ec0d.tar.bz2 | |
Merge "Handle multi-user mountObb() requests." into jb-mr1-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/storage/IMountService.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/storage/IMountService.cpp b/libs/storage/IMountService.cpp index 4ec8b25..5701678 100644 --- a/libs/storage/IMountService.cpp +++ b/libs/storage/IMountService.cpp @@ -433,12 +433,13 @@ public: reply.readExceptionCode(); } - void mountObb(const String16& filename, const String16& key, + void mountObb(const String16& rawPath, const String16& canonicalPath, const String16& key, const sp<IObbActionListener>& token, int32_t nonce) { Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); - data.writeString16(filename); + data.writeString16(rawPath); + data.writeString16(canonicalPath); data.writeString16(key); data.writeStrongBinder(token->asBinder()); data.writeInt32(nonce); |