diff options
author | Mathias Agopian <mathias@google.com> | 2010-09-24 18:13:22 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 18:13:22 -0700 |
commit | d95fec08916698f7bdd9f4b293d418ae4b4f60c5 (patch) | |
tree | d41977f1c885afe6749debec7b6caff27b09e12b /services/surfaceflinger/SurfaceFlinger.h | |
parent | 960099572d97df03786927974e760070fca3e1ef (diff) | |
parent | 495ad4f22096aa172d025c16c25497e7dad8f2bd (diff) | |
download | frameworks_base-d95fec08916698f7bdd9f4b293d418ae4b4f60c5.zip frameworks_base-d95fec08916698f7bdd9f4b293d418ae4b4f60c5.tar.gz frameworks_base-d95fec08916698f7bdd9f4b293d418ae4b4f60c5.tar.bz2 |
am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit '495ad4f22096aa172d025c16c25497e7dad8f2bd'
* commit '495ad4f22096aa172d025c16c25497e7dad8f2bd':
simple test app for screen capture API
add support for [1974164] Be able to take a screen shot on the device
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.h')
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 551e8e7..6e9ecbd 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -193,6 +193,11 @@ public: virtual status_t unfreezeDisplay(DisplayID dpy, uint32_t flags); virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags); virtual void signal() const; + virtual status_t captureScreen(DisplayID dpy, + sp<IMemoryHeap>* heap, + uint32_t* width, + uint32_t* height, + PixelFormat* format); void screenReleased(DisplayID dpy); void screenAcquired(DisplayID dpy); @@ -362,6 +367,7 @@ private: nsecs_t mBootTime; Permission mHardwareTest; Permission mAccessSurfaceFlinger; + Permission mReadFramebuffer; Permission mDump; // Can only accessed from the main thread, these members |