Merge da003a2f1e20e737be010f19705b036bc78bc38e on remote branch
Change-Id: If5736013607cea4eb6d15f10d66224d2388cae20
diff --git a/config/display-product-commonsys.mk b/config/display-product-commonsys.mk
index 702b047..0b913da 100644
--- a/config/display-product-commonsys.mk
+++ b/config/display-product-commonsys.mk
@@ -1,5 +1,4 @@
PRODUCT_PACKAGES += libdisplayconfig.system \
- libqdMetaData.system \
libgralloc.system.qti \
libdrm \
liblayerext.qti \
@@ -8,14 +7,21 @@
libdisplayconfig.system.qti
SOONG_CONFIG_NAMESPACES += qtidisplaycommonsys
-SOONG_CONFIG_NAMESPACES += qtiunifeddraw
# Soong Keys
-SOONG_CONFIG_qtidisplaycommonsys := displayconfig_enabled
-SOONG_CONFIG_qtiunifeddraw := qtiunifeddraw_enabled
+SOONG_CONFIG_qtidisplaycommonsys := displayextension composer3ext
# Soong Values
-SOONG_CONFIG_qtidisplaycommonsys_displayconfig_enabled := false
-SOONG_CONFIG_qtiunifeddraw_qtiunifeddraw_enabled := true
+
+# displayextension controls global compile time disablement of SF extensions
+SOONG_CONFIG_qtidisplaycommonsys_displayextension := false
+
+# Variables can be added here on a transient basis to merge
+# features that are not yet consumed in keystone
+# Once the feature has been consumed, these can be removed
+# and the feature can be enabled/disabled at run time via android
+# properties
+SOONG_CONFIG_qtidisplaycommonsys_composer3ext := false
ifeq ($(call is-vendor-board-platform,QCOM),true)
- SOONG_CONFIG_qtidisplaycommonsys_displayconfig_enabled := true
+ SOONG_CONFIG_qtidisplaycommonsys_displayextension := true
+ SOONG_CONFIG_qtidisplaycommonsys_composer3ext := true
endif
diff --git a/services/config/src/client_impl.cpp b/services/config/src/client_impl.cpp
index 68807a9..197af93 100644
--- a/services/config/src/client_impl.cpp
+++ b/services/config/src/client_impl.cpp
@@ -71,7 +71,7 @@
namespace DisplayConfig {
int ClientImpl::Init(std::string client_name, ConfigCallback *callback) {
- display_config_ = IDisplayConfig::getService();
+ display_config_ = IDisplayConfig::tryGetService();
// Unable to find Display Config 2.0 service. Fail Init.
if (!display_config_) {
return -1;