Snap for 11179907 from d4b7e71a0f4ac726740a2dac6c6ad8e440f1bf08 to u-keystone-qcom-release

Change-Id: I6e1744fcf02a23f65c6ddaf4d98347bc094b7b1d

1 files changed, 4 insertions, 1 deletions

diff --git a/services/surfaceflinger/QtiExtension/QtiSurfaceFlingerExtension.cpp b/services/surfaceflinger/QtiExtension/QtiSurfaceFlingerExtension.cpp
index cb669e6085..cbf39468fa 100644
--- a/services/surfaceflinger/QtiExtension/QtiSurfaceFlingerExtension.cpp
+++ b/services/surfaceflinger/QtiExtension/QtiSurfaceFlingerExtension.cpp
@@ -1669,7 +1669,10 @@ void QtiSurfaceFlingerExtension::qtiUpdateSmomoLayerStackId(hal::HWDisplayId hwc
 }
 
 uint32_t QtiSurfaceFlingerExtension::qtiGetLayerClass(std::string mName) {
-    if (mQtiLayerExt) {
+    bool mUseLayerExt =
+            mQtiFeatureManager->qtiIsExtensionFeatureEnabled(QtiFeature::kLayerExtension);
+
+    if (mUseLayerExt && mQtiLayerExt) {
         uint32_t layerClass = static_cast<uint32_t>(mQtiLayerExt->GetLayerClass(mName));
         return layerClass;
     }