diff options
| author | 2020-05-02 02:12:38 +0000 | |
|---|---|---|
| committer | 2020-05-02 02:12:38 +0000 | |
| commit | 32bc62dc0ee36890d93ca1bf9e304bdcb3ef623a (patch) | |
| tree | 09315e6ce2b59473ad111e5170f3e9a012457084 /libs/gui/SurfaceComposerClient.cpp | |
| parent | 5b7d7e2150c20e6dfbf5afe2f81d6f0a5639ec38 (diff) | |
| parent | f734df4201b74a7131ddd9558d7e6c9ea67a9b11 (diff) | |
Merge "Split refresh rate range into two ranges" into rvc-dev
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
| -rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 28 | 
1 files changed, 16 insertions, 12 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index d9cbeb71d2..a52f298e77 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -1698,22 +1698,26 @@ int SurfaceComposerClient::getActiveConfig(const sp<IBinder>& display) {  status_t SurfaceComposerClient::setDesiredDisplayConfigSpecs(const sp<IBinder>& displayToken,                                                               int32_t defaultConfig, -                                                             float minRefreshRate, -                                                             float maxRefreshRate) { -    return ComposerService::getComposerService()->setDesiredDisplayConfigSpecs(displayToken, -                                                                               defaultConfig, -                                                                               minRefreshRate, -                                                                               maxRefreshRate); +                                                             float primaryRefreshRateMin, +                                                             float primaryRefreshRateMax, +                                                             float appRequestRefreshRateMin, +                                                             float appRequestRefreshRateMax) { +    return ComposerService::getComposerService() +            ->setDesiredDisplayConfigSpecs(displayToken, defaultConfig, primaryRefreshRateMin, +                                           primaryRefreshRateMax, appRequestRefreshRateMin, +                                           appRequestRefreshRateMax);  }  status_t SurfaceComposerClient::getDesiredDisplayConfigSpecs(const sp<IBinder>& displayToken,                                                               int32_t* outDefaultConfig, -                                                             float* outMinRefreshRate, -                                                             float* outMaxRefreshRate) { -    return ComposerService::getComposerService()->getDesiredDisplayConfigSpecs(displayToken, -                                                                               outDefaultConfig, -                                                                               outMinRefreshRate, -                                                                               outMaxRefreshRate); +                                                             float* outPrimaryRefreshRateMin, +                                                             float* outPrimaryRefreshRateMax, +                                                             float* outAppRequestRefreshRateMin, +                                                             float* outAppRequestRefreshRateMax) { +    return ComposerService::getComposerService() +            ->getDesiredDisplayConfigSpecs(displayToken, outDefaultConfig, outPrimaryRefreshRateMin, +                                           outPrimaryRefreshRateMax, outAppRequestRefreshRateMin, +                                           outAppRequestRefreshRateMax);  }  status_t SurfaceComposerClient::getDisplayColorModes(const sp<IBinder>& display,  |