diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/storage/IMountService.h | 4 | ||||
| -rw-r--r-- | include/storage/IObbActionListener.h | 2 | ||||
| -rw-r--r-- | include/surfaceflinger/ISurfaceComposer.h | 5 |
3 files changed, 7 insertions, 4 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; }; // ---------------------------------------------------------------------------- diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h index b181781..ac69a06 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -119,6 +119,8 @@ public: uint32_t* width, uint32_t* height, PixelFormat* format, uint32_t reqWidth, uint32_t reqHeight) = 0; + virtual status_t turnElectronBeamOff(int32_t mode) = 0; + /* Signal surfaceflinger that there might be some work to do * This is an ASYNCHRONOUS call. */ @@ -143,7 +145,8 @@ public: FREEZE_DISPLAY, UNFREEZE_DISPLAY, SIGNAL, - CAPTURE_SCREEN + CAPTURE_SCREEN, + TURN_ELECTRON_BEAM_OFF }; virtual status_t onTransact( uint32_t code, |