sdm: Update hwr dumping property usage
* Only log for non-user variants
* Fixed messages printed from SDM
* Recovery mechanism is enabled for all build variants for the target
makefile being modified
Change-Id: I6efd520b8f69626b8ae70cf582e553d6677f70c2
CRs-Fixed: 2361836
diff --git a/config/msmnile.mk b/config/msmnile.mk
index ff163ef..07e0976 100644
--- a/config/msmnile.mk
+++ b/config/msmnile.mk
@@ -58,9 +58,21 @@
vendor.display.enable_null_display=0 \
vendor.display.disable_excl_rect=0 \
vendor.display.comp_mask=0 \
- vendor.display.disable_hw_recovery=0 \
vendor.display.enable_default_color_mode=1
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+# Recovery is enabled, logging is enabled
+PRODUCT_PROPERTY_OVERRIDES += \
+ vendor.display.disable_hw_recovery_dump=0
+else
+# Recovery is enabled, logging is disabled
+PRODUCT_PROPERTY_OVERRIDES += \
+ vendor.display.disable_hw_recovery_dump=1
+endif
+
+# Properties using default value:
+# vendor.display.disable_hw_recovery=0
+
# This matrix should be in column major order, per SurfaceFlinger requirement
# 1.0 0.0 0.0
# 0.0 1.0 0.0
diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index e416035..137e3dc 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -1693,9 +1693,11 @@
hw_intf_->DumpDebugData();
hw_recovery_logs_captured_ = true;
DLOGI("Captured debugfs data for display = %d", display_type_);
- } else {
+ } else if (!disable_hw_recovery_dump_) {
DLOGI("Multiple capture events without intermediate success event, skipping debugfs"
"capture for display = %d", display_type_);
+ } else {
+ DLOGI("Debugfs data dumping is disabled for display = %d", display_type_);
}
break;
case HWRecoveryEvent::kDisplayPowerReset: