Refine hdcpd and hdcpTestutily

1. Remove unsed source code
2. Rename USES_IA_HWCOMPOSER define

Tracked-On: OAM-130842
Signed-off-by: Jia, Lin A <lin.a.jia@intel.com>

Author: ljia5

daemon/Android.bp

@@ -24,7 +24,7 @@ cc_binary {
 
     cppflags: [
         "-DANDROID",
-        "-DUSES_IA_HWCOMPOSER",
+        "-DUSES_HDCP_HWCOMPOSER",
         "-DANDROID_VERSION=800",
         "-DLOG_TAG=\"HDCPD\"",
     ] + ["-DLOG_CONSOLE"] + [ // LOG_CONSOLE will print ALOGI, ALOGE, ALOGW in Android. Enable on debug build

daemon/portmanager.cpp

@@ -1449,7 +1449,7 @@ int32_t PortManagerHWComposer::SetPortProperty(
 
     android::ProcessState::initWithDriver(BINDER_IPC);
 
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
     HDCP_NORMALMESSAGE("PortManagerHWComposer::SetPortProperty hwcService_Connect");
     // Connect to HWC service
     HWCSHANDLE hwcs = HwcService_Connect();

daemon/portmanager.h

@@ -37,15 +37,15 @@
 
 #ifdef ANDROID
 
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
 #include <hwcserviceapi.h>
 #endif
 
 #include <log/log.h>
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
 
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
 #include <iservice.h>
 #endif
 

daemon/portmanager_android.cpp

@@ -31,15 +31,15 @@
 #include "portmanager.h"
 #include "portmanager_android.h"
 
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
 #include <hwcserviceapi.h>
 #endif
 
 #include <log/log.h>
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
 
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
 #include <iservice.h>
 #endif
 
@@ -131,7 +131,7 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
 
     android::ProcessState::initWithDriver("/dev/vndbinder");
 
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
     // Connect to HWC service
     HWCSHANDLE hwcs = HwcService_Connect();
     if (hwcs == NULL) {
@@ -156,18 +156,16 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
         for (uint32_t i = 0; i < numRetry; ++i)
         {
 
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
            if(propId == drmObject->GetPropertyId(CONTENT_PROTECTION))
            {
-	       HDCP_ASSERTMESSAGE("Attempting HDCP Enable, value =%d", value);
-	       HDCP_ASSERTMESSAGE("Attempting HDCP Enable, propValue =%d", propValue);
+	       HDCP_ASSERTMESSAGE("Attempting HDCP Enable, value =%d, propValue =%d", value, propValue);
                ret = HwcService_Video_EnableHDCPSession_ForDisplay(
                    hwcs, drmId, (EHwcsContentType)propValue);
            } else if(propId == drmObject->GetPropertyId(CP_CONTENT_TYPE))
            {
                //This is only for HDCP2.2
-	       HDCP_ASSERTMESSAGE("Attempting HDCP Enable Type, value =%d", value);
-	       HDCP_ASSERTMESSAGE("Attempting HDCP Enable Type, propValue =%d", propValue);
+	       HDCP_ASSERTMESSAGE("Attempting HDCP Enable, value =%d, propValue =%d", value, propValue);
                ret = HwcService_Video_EnableHDCPSession_ForDisplay(
                    hwcs, drmId, (EHwcsContentType)propValue);
            } else if(propId == drmObject->GetPropertyId(CP_SRM))
@@ -212,15 +210,15 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
 
     if (SUCCESS != ret)
     {
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
         HwcService_Disconnect(hwcs);
 #endif
 	HDCP_ASSERTMESSAGE("Failed to Enable HDCP");
         HDCP_FUNCTION_EXIT(EBUSY);
         return EBUSY;
     }
 
-#ifdef USES_IA_HWCOMPOSER
+#ifdef USES_HDCP_HWCOMPOSER
     HwcService_Disconnect(hwcs);
 #endif
     HDCP_FUNCTION_EXIT(SUCCESS);