diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-28 03:12:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-28 03:12:18 +0000 |
commit | b6040af4e59337c663840ed530e0af1dc608b760 (patch) | |
tree | 4b35c5e3e86f62a5ad20d38478d7ac8f23e8634c /libs/gui/include | |
parent | cc26306fba7381bee3503e634953edbbfec1c2e6 (diff) | |
parent | d9b3ea613a021c7b393db967298fc8fa2fef7300 (diff) | |
download | android_frameworks_native-b6040af4e59337c663840ed530e0af1dc608b760.tar.gz android_frameworks_native-b6040af4e59337c663840ed530e0af1dc608b760.tar.bz2 android_frameworks_native-b6040af4e59337c663840ed530e0af1dc608b760.zip |
Merge "SurfaceFlinger: add getAllowedDisplayConfigs"
Diffstat (limited to 'libs/gui/include')
-rw-r--r-- | libs/gui/include/gui/ISurfaceComposer.h | 9 | ||||
-rw-r--r-- | libs/gui/include/gui/SurfaceComposerClient.h | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libs/gui/include/gui/ISurfaceComposer.h b/libs/gui/include/gui/ISurfaceComposer.h index eedd5f583..0e576ca95 100644 --- a/libs/gui/include/gui/ISurfaceComposer.h +++ b/libs/gui/include/gui/ISurfaceComposer.h @@ -368,6 +368,14 @@ public: */ virtual status_t setAllowedDisplayConfigs(const sp<IBinder>& displayToken, const std::vector<int32_t>& allowedConfigs) = 0; + + /* + * Returns the allowed display configurations currently set. + * The allowedConfigs in a vector of indexes corresponding to the configurations + * returned from getDisplayConfigs(). + */ + virtual status_t getAllowedDisplayConfigs(const sp<IBinder>& displayToken, + std::vector<int32_t>* outAllowedConfigs) = 0; }; // ---------------------------------------------------------------------------- @@ -416,6 +424,7 @@ public: ADD_REGION_SAMPLING_LISTENER, REMOVE_REGION_SAMPLING_LISTENER, SET_ALLOWED_DISPLAY_CONFIGS, + GET_ALLOWED_DISPLAY_CONFIGS, // Always append new enum to the end. }; diff --git a/libs/gui/include/gui/SurfaceComposerClient.h b/libs/gui/include/gui/SurfaceComposerClient.h index 4621a3478..e0623399b 100644 --- a/libs/gui/include/gui/SurfaceComposerClient.h +++ b/libs/gui/include/gui/SurfaceComposerClient.h @@ -117,6 +117,12 @@ public: static status_t setAllowedDisplayConfigs(const sp<IBinder>& displayToken, const std::vector<int32_t>& allowedConfigs); + // Returns the allowed display configurations currently set. + // The allowedConfigs in a vector of indexes corresponding to the configurations + // returned from getDisplayConfigs(). + static status_t getAllowedDisplayConfigs(const sp<IBinder>& displayToken, + std::vector<int32_t>* outAllowedConfigs); + // Gets the list of supported color modes for the given display static status_t getDisplayColorModes(const sp<IBinder>& display, Vector<ui::ColorMode>* outColorModes); |