Revert "Sync graphics mixin update"

This reverts commit 61fdc4e.
projectceladon · May 10, 2022 · a28271d · a28271d
1 parent 61fdc4e
commit a28271d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 26 deletions.
diff --git a/daemon/Android.mk b/daemon/Android.mk
@@ -60,7 +60,8 @@ LOCAL_SHARED_LIBRARIES := \
     liblog \
     libcrypto \
     libdrm \
-    libssl
+    libssl \
+    libhwcservice
 
 LOCAL_STATIC_LIBRARIES := \
     libhdcpcommon \

diff --git a/daemon/portmanager.cpp b/daemon/portmanager.cpp
@@ -1436,7 +1436,6 @@ int32_t PortManagerHWComposer::SetPortProperty(
 
     android::ProcessState::initWithDriver(BINDER_IPC);
 
-#ifdef USES_IA_HWCOMPOSER
     // Connect to HWC service
     HWCSHANDLE hwcs = HwcService_Connect();
     if (nullptr == hwcs)
@@ -1483,7 +1482,6 @@ int32_t PortManagerHWComposer::SetPortProperty(
     }
 
     HwcService_Disconnect(hwcs);
-#endif
 
     if (SUCCESS != ret)
     {

diff --git a/daemon/portmanager.h b/daemon/portmanager.h
@@ -36,18 +36,11 @@
 #include "port.h"
 
 #ifdef ANDROID
-
-#ifdef USES_IA_HWCOMPOSER
 #include <hwcserviceapi.h>
-#endif
-
 #include <log/log.h>
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
-
-#ifdef USES_IA_HWCOMPOSER
 #include <iservice.h>
-#endif
 
 #define BINDER_IPC          "/dev/vndbinder"
 #endif

diff --git a/daemon/portmanager_android.cpp b/daemon/portmanager_android.cpp
@@ -31,17 +31,11 @@
 #include "portmanager.h"
 #include "portmanager_android.h"
 
-#ifdef USES_IA_HWCOMPOSER
 #include <hwcserviceapi.h>
-#endif
-
 #include <log/log.h>
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
-
-#ifdef USES_IA_HWCOMPOSER
 #include <iservice.h>
-#endif
 
 #include "xf86drm.h"
 #include "xf86drmMode.h"
@@ -128,7 +122,6 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
 
     android::ProcessState::initWithDriver("/dev/vndbinder");
 
-#ifdef USES_IA_HWCOMPOSER
     // Connect to HWC service
     HWCSHANDLE hwcs = HwcService_Connect();
     if (hwcs == NULL) {
@@ -145,15 +138,12 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
                 hwcs,
                 drmId);
     }
-#endif
 
     //Enable CP and SendSRM
     if (numRetry > 1)
     {
         for (uint32_t i = 0; i < numRetry; ++i)
         {
-
-#ifdef USES_IA_HWCOMPOSER
            if(propId == drmObject->GetPropertyId(CONTENT_PROTECTION))
            {
 	       HDCP_ASSERTMESSAGE("Attempting HDCP Enable");
@@ -176,7 +166,6 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
                hwcs = NULL;
                ret = EINVAL;
            }
-#endif
            if(SUCCESS == ret)
            {
                // Invalid the cpValue/cpType
@@ -206,17 +195,13 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
 
     if (SUCCESS != ret)
     {
-#ifdef USES_IA_HWCOMPOSER
         HwcService_Disconnect(hwcs);
-#endif
-	HDCP_ASSERTMESSAGE("Failed to Enable HDCP");
+        HDCP_ASSERTMESSAGE("Failed to Enable HDCP");
         HDCP_FUNCTION_EXIT(EBUSY);
         return EBUSY;
     }
 
-#ifdef USES_IA_HWCOMPOSER
     HwcService_Disconnect(hwcs);
-#endif
     HDCP_FUNCTION_EXIT(SUCCESS);
     return SUCCESS;
 } //setPortProperty_hwcservice