diff options
| author | Kenny Root <kroot@google.com> | 2010-10-08 09:21:39 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-11 17:22:03 -0700 |
| commit | af9d667ccf3e24058214cf4cc0a8aa8bc5100e3c (patch) | |
| tree | c59adbe6d27cf236d6920f689dd237a115fef3f9 /include | |
| parent | ce2f1909c74a1b90995f06a865d21260b062300b (diff) | |
| download | frameworks_base-af9d667ccf3e24058214cf4cc0a8aa8bc5100e3c.zip frameworks_base-af9d667ccf3e24058214cf4cc0a8aa8bc5100e3c.tar.gz frameworks_base-af9d667ccf3e24058214cf4cc0a8aa8bc5100e3c.tar.bz2 | |
OBB: rearrange to be entirely asynchronous
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.
Added more tests to cover more of the error return codes.
Oh and fix a logic inversion bug.
Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
Diffstat (limited to 'include')
| -rw-r--r-- | include/storage/IMountService.h | 4 | ||||
| -rw-r--r-- | include/storage/IObbActionListener.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/storage/IMountService.h b/include/storage/IMountService.h index 436fc38..51f9aeb 100644 --- a/include/storage/IMountService.h +++ b/include/storage/IMountService.h @@ -61,9 +61,9 @@ public: virtual void shutdown(const sp<IMountShutdownObserver>& observer) = 0; virtual void finishMediaUpdate() = 0; virtual void mountObb(const String16& filename, const String16& key, - const sp<IObbActionListener>& token) = 0; + const sp<IObbActionListener>& token, const int32_t nonce) = 0; virtual void unmountObb(const String16& filename, const bool force, - const sp<IObbActionListener>& token) = 0; + const sp<IObbActionListener>& token, const int32_t nonce) = 0; virtual bool isObbMounted(const String16& filename) = 0; virtual bool getMountedObbPath(const String16& filename, String16& path) = 0; }; diff --git a/include/storage/IObbActionListener.h b/include/storage/IObbActionListener.h index 1bedcc6..d78273c 100644 --- a/include/storage/IObbActionListener.h +++ b/include/storage/IObbActionListener.h @@ -29,7 +29,7 @@ class IObbActionListener: public IInterface public: DECLARE_META_INTERFACE(ObbActionListener); - virtual void onObbResult(const String16& filename, const String16& status) = 0; + virtual void onObbResult(const String16& filename, const int32_t nonce, const int32_t state) = 0; }; // ---------------------------------------------------------------------------- |