summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--hwc2/common/base/Hwcomposer.cpp7
-rw-r--r--hwc2/common/devices/PhysicalDevice.cpp53
-rw-r--r--hwc2/common/hdmi/DisplayHdmi.cpp121
-rw-r--r--hwc2/common/hdmi/DisplayHdmi.h19
-rw-r--r--hwc2/platforms/Android.mk13
5 files changed, 175 insertions, 38 deletions
diff --git a/hwc2/common/base/Hwcomposer.cpp b/hwc2/common/base/Hwcomposer.cpp
index 0602f77..a271778 100644
--- a/hwc2/common/base/Hwcomposer.cpp
+++ b/hwc2/common/base/Hwcomposer.cpp
@@ -928,12 +928,17 @@ bool Hwcomposer::release() {
bool Hwcomposer::initialize(private_module_t *grallocModule) {
CTRACE();
- if (!mPlatFactory || !grallocModule) {
+ if (!mPlatFactory) {
DEINIT_AND_RETURN_FALSE("failed to provide a PlatFactory");
}
+#if PLATFORM_SDK_VERSION < 26
+ if ( !grallocModule) {
+ DEINIT_AND_RETURN_FALSE("failed to provide a grallocModule");
+ }
// initial gralloc module.
mGrallocModule = grallocModule;
+#endif
mUeventObserver = new UeventObserver();
if (!mUeventObserver || !mUeventObserver->initialize()) {