diff options
author | 2016-04-08 23:13:01 +0000 | |
---|---|---|
committer | 2016-04-08 23:13:01 +0000 | |
commit | 97a46df0ee9708822f190a76047c490f54c199cd (patch) | |
tree | 1e98ef22bba5def39716a8b35716b19c04686f8d /libs/gui/SurfaceComposerClient.cpp | |
parent | 45d15b835738497f812bec55affc9a1cba4ec343 (diff) | |
parent | c4f471e75a8ec64ec34e3f2944a5a756215d0bec (diff) |
Merge changes I0f07043f,Ib4635ee4,I472ad9f0 into nyc-dev
* changes:
Plumb HDR capabilities up to SurfaceComposerClient
HWC2: Add getHdrCapabilities to C++ shim
HWC2: Add getHdrCapabilities stub to adapter
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
-rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 04b5446d42..418892a1c3 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -722,6 +722,12 @@ status_t SurfaceComposerClient::getAnimationFrameStats(FrameStats* outStats) { return ComposerService::getComposerService()->getAnimationFrameStats(outStats); } +status_t SurfaceComposerClient::getHdrCapabilities(const sp<IBinder>& display, + HdrCapabilities* outCapabilities) { + return ComposerService::getComposerService()->getHdrCapabilities(display, + outCapabilities); +} + // ---------------------------------------------------------------------------- status_t ScreenshotClient::capture( |