Revert "sdm: Conditionally revert "sdm: Implement ‘Null Display’ in SDM core""
This reverts commit 3c2298b15f3b5dd78aee41978a7d0f4a6bff65ee.
Reason for revert: no longer needed when using blobs that match tag
DISPLAY.LA.3.0.r1-10700-KAILUA.0.
Change-Id: I553c335225457b6ae8baebb2405cf3dfed3afd13
diff --git a/sdm/include/private/resource_interface.h b/sdm/include/private/resource_interface.h
index e95eb9a..c68e77a 100644
--- a/sdm/include/private/resource_interface.h
+++ b/sdm/include/private/resource_interface.h
@@ -143,9 +143,7 @@
virtual uint32_t GetMixerCount() = 0;
virtual void HandleTUITransition(Handle display_ctx, bool tui_active) = 0;
virtual DisplayError SetBlendSpace(Handle display_ctx, const PrimariesTransfer &blend_space) = 0;
-#ifdef SDMCORE_HAS_IS_DISPLAY_HW_AVAILABLE_FUNC
virtual bool IsDisplayHWAvailable() = 0;
-#endif
};
} // namespace sdm
diff --git a/sdm/libs/core/Android.bp b/sdm/libs/core/Android.bp
index 683066a..ef10e8e 100644
--- a/sdm/libs/core/Android.bp
+++ b/sdm/libs/core/Android.bp
@@ -1,9 +1,6 @@
cc_library_shared {
name: "libsdmcore",
- defaults: [
- "qtidisplay_defaults",
- "sdmcore_has_is_display_hw_available_func_defaults",
- ],
+ defaults: ["qtidisplay_defaults"],
sanitize: {
integer_overflow: true,
},
diff --git a/sdm/libs/core/comp_manager.cpp b/sdm/libs/core/comp_manager.cpp
old mode 100644
new mode 100755
index 7f14600..b2812ee
--- a/sdm/libs/core/comp_manager.cpp
+++ b/sdm/libs/core/comp_manager.cpp
@@ -811,16 +811,12 @@
}
bool CompManager::IsDisplayHWAvailable() {
-#ifdef SDMCORE_HAS_IS_DISPLAY_HW_AVAILABLE_FUNC
std::lock_guard<std::recursive_mutex> obj(comp_mgr_mutex_);
if (resource_intf_) {
return resource_intf_->IsDisplayHWAvailable();
}
return false;
-#else
- return true;
-#endif
}