diff options
| author | 2012-08-27 17:16:36 -0700 | |
|---|---|---|
| committer | 2012-08-27 17:16:37 -0700 | |
| commit | e310c3949f7de7183ef43e751526a5dc4cf0d74c (patch) | |
| tree | 3b70c75d02162024963146bbc44aaec1419c5104 /include/gui/ISurfaceComposerClient.h | |
| parent | f671385e71644b6f34a06f425aff8dd16ffc0105 (diff) | |
| parent | 9d4e3d2f42e93e2d12bacabe97d307d30c3c20dd (diff) | |
Merge "Banish DisplayID from the SurfaceFlinger API." into jb-mr1-dev
Diffstat (limited to 'include/gui/ISurfaceComposerClient.h')
| -rw-r--r-- | include/gui/ISurfaceComposerClient.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/gui/ISurfaceComposerClient.h b/include/gui/ISurfaceComposerClient.h index 259c1dff84..39cf090290 100644 --- a/include/gui/ISurfaceComposerClient.h +++ b/include/gui/ISurfaceComposerClient.h @@ -33,6 +33,7 @@ namespace android { // ---------------------------------------------------------------------------- +// TODO: Remove this declaration, it is only used internally by SurfaceFlinger. typedef int32_t DisplayID; // ---------------------------------------------------------------------------- @@ -70,7 +71,7 @@ public: * Requires ACCESS_SURFACE_FLINGER permission */ virtual sp<ISurface> createSurface(surface_data_t* data, - const String8& name, DisplayID display, uint32_t w, uint32_t h, + const String8& name, uint32_t w, uint32_t h, PixelFormat format, uint32_t flags) = 0; /* |