summaryrefslogtreecommitdiff
path: root/configstore
diff options
context:
space:
mode:
authorValerie Hau <vhau@google.com>2018-10-09 16:09:12 -0700
committerValerie Hau <vhau@google.com>2018-10-22 11:19:52 -0700
commitec9830654992ffb8cbfbd4734e4a8c2d0145d41c (patch)
treebe5065e6a0996107056e8a48d846f298640f9045 /configstore
parent6e457995b6976e0350bccb22064ca2e90cd9540b (diff)
Adding Dataspace BT2020_SRGB and ColorMode BT2020_SRGB
BT2020_SRGB is BT2020 with SRGB transfer function. Adding to types V1.2 and upgrading methods that utilize Dataspace and ColorMode Bug: 115335239 Test: ./libsurfaceflinger_unittest --gtest_filter=GetBestColorMode.* Change-Id: Ic807183ae2bd0212cd8c5d7a24c93db0a1bc28fb
Diffstat (limited to 'configstore')
-rw-r--r--configstore/1.2/Android.bp4
-rw-r--r--configstore/1.2/ISurfaceFlingerConfigs.hal2
-rw-r--r--configstore/1.2/default/SurfaceFlingerConfigs.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/configstore/1.2/Android.bp b/configstore/1.2/Android.bp
index cc5644ca80..c525a72a99 100644
--- a/configstore/1.2/Android.bp
+++ b/configstore/1.2/Android.bp
@@ -12,8 +12,8 @@ hidl_interface {
interfaces: [
"android.hardware.configstore@1.1",
"android.hardware.configstore@1.0",
- "android.hardware.graphics.common@1.1",
+ "android.hardware.graphics.common@1.2",
"android.hidl.base@1.0",
],
gen_java: true,
-} \ No newline at end of file
+}
diff --git a/configstore/1.2/ISurfaceFlingerConfigs.hal b/configstore/1.2/ISurfaceFlingerConfigs.hal
index c8791553a2..9553fca6e5 100644
--- a/configstore/1.2/ISurfaceFlingerConfigs.hal
+++ b/configstore/1.2/ISurfaceFlingerConfigs.hal
@@ -15,8 +15,8 @@
*/
package android.hardware.configstore@1.2;
-import android.hardware.graphics.common@1.1::Dataspace;
import android.hardware.graphics.common@1.1::PixelFormat;
+import android.hardware.graphics.common@1.2::Dataspace;
import @1.1::ISurfaceFlingerConfigs;
import @1.0::OptionalBool;
diff --git a/configstore/1.2/default/SurfaceFlingerConfigs.cpp b/configstore/1.2/default/SurfaceFlingerConfigs.cpp
index ae19dc0799..b78d15e2f2 100644
--- a/configstore/1.2/default/SurfaceFlingerConfigs.cpp
+++ b/configstore/1.2/default/SurfaceFlingerConfigs.cpp
@@ -26,8 +26,8 @@ namespace configstore {
namespace V1_2 {
namespace implementation {
-using ::android::hardware::graphics::common::V1_1::Dataspace;
using ::android::hardware::graphics::common::V1_1::PixelFormat;
+using ::android::hardware::graphics::common::V1_2::Dataspace;
// ::android::hardware::configstore::V1_0::ISurfaceFlingerConfigs implementation.
Return<void> SurfaceFlingerConfigs::vsyncEventPhaseOffsetNs(vsyncEventPhaseOffsetNs_cb _hidl_cb) {