diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-10-22 13:54:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-22 13:54:50 -0700 |
| commit | 3b6055a7184a2da7bbdd94118a8c6af875bb28b1 (patch) | |
| tree | bcf05782961e3783a251d588978d7baf87e6a4c4 /include | |
| parent | 44c985ef7d0b6d94fa9df3fd5ea718eca0ecdbd1 (diff) | |
| parent | ba7dc2db6e93a2407c8c328f2838591b7b760658 (diff) | |
| download | frameworks_native-3b6055a7184a2da7bbdd94118a8c6af875bb28b1.zip frameworks_native-3b6055a7184a2da7bbdd94118a8c6af875bb28b1.tar.gz frameworks_native-3b6055a7184a2da7bbdd94118a8c6af875bb28b1.tar.bz2 | |
am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
* commit 'ba7dc2db6e93a2407c8c328f2838591b7b760658':
SurfaceFlinger: add support for secure displays
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/ISurfaceComposer.h | 6 | ||||
| -rw-r--r-- | include/gui/SurfaceComposerClient.h | 2 | ||||
| -rw-r--r-- | include/ui/DisplayInfo.h | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 002aafc..6500ad5 100644 --- a/include/gui/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h @@ -69,7 +69,8 @@ public: /* create a display * requires ACCESS_SURFACE_FLINGER permission. */ - virtual sp<IBinder> createDisplay(const String8& displayName) = 0; + virtual sp<IBinder> createDisplay(const String8& displayName, + bool secure) = 0; /* get the token for the existing default displays. possible values * for id are eDisplayIdMain and eDisplayIdHdmi. @@ -108,9 +109,6 @@ public: /* returns information about a display * intended to be used to get information about built-in displays */ virtual status_t getDisplayInfo(const sp<IBinder>& display, DisplayInfo* info) = 0; - - /* connects to an external display */ - virtual void connectDisplay(const sp<ISurfaceTexture>& display) = 0; }; // ---------------------------------------------------------------------------- diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h index 21d16a9..ae5d69a 100644 --- a/include/gui/SurfaceComposerClient.h +++ b/include/gui/SurfaceComposerClient.h @@ -86,7 +86,7 @@ public: ); //! Create a display - static sp<IBinder> createDisplay(const String8& displayName); + static sp<IBinder> createDisplay(const String8& displayName, bool secure); //! Get the token for the existing default displays. //! Possible values for id are eDisplayIdMain and eDisplayIdHdmi. diff --git a/include/ui/DisplayInfo.h b/include/ui/DisplayInfo.h index c7dc354..c3a4d6b 100644 --- a/include/ui/DisplayInfo.h +++ b/include/ui/DisplayInfo.h @@ -32,7 +32,8 @@ struct DisplayInfo { float fps; float density; uint8_t orientation; - uint8_t reserved[3]; + bool secure; + uint8_t reserved[2]; // TODO: this needs to go away (currently needed only by webkit) PixelFormatInfo pixelFormatInfo; }; |