project common/
diff --git a/drivers/amlogic/cec/hdmi_ao_cec.c b/drivers/amlogic/cec/hdmi_ao_cec.c
old mode 100644
new mode 100755
index b9b5b4de8cdc..1c1216ae7b02
--- a/drivers/amlogic/cec/hdmi_ao_cec.c
+++ b/drivers/amlogic/cec/hdmi_ao_cec.c
@@ -3460,6 +3460,10 @@ static long hdmitx_cec_ioctl(struct file *f,
 		 * takes the value F.F.F.F
 		 */
 		tmp = cec_get_cur_phy_addr();
+
+		CEC_ERR("[HKTEST] CEC_IOC_GET_PHYSICAL_ADDR phy_addr = %x, cec_dev->dev_type %x, CEC_TV_ADDR(%x, get_hpd_state(%d)) \n", (unsigned int)tmp, (unsigned int)cec_dev->dev_type, (unsigned int)CEC_TV_ADDR, (unsigned int)get_hpd_state());
+
+#if 0   /* HKTEST TEST */		
 		if (cec_dev->dev_type != CEC_TV_ADDR) {
 			if (get_hpd_state() == 0)
 				cec_dev->phy_addr = 0xffff;
@@ -3470,6 +3474,11 @@ static long hdmitx_cec_ioctl(struct file *f,
 		} else {
 			cec_dev->phy_addr = 0;
 		}
+#else
+		if ((cec_dev->dev_type != CEC_TV_ADDR) && (tmp != 0) &&
+			tmp != 0xffff)
+			cec_dev->phy_addr = tmp;
+#endif
 
 		if (!phy_addr_test) {
 			cec_config2_phyaddr(cec_dev->phy_addr, 1);
@@ -3609,7 +3618,7 @@ static long hdmitx_cec_ioctl(struct file *f,
 		} else {
 			tmp = cec_dev->tx_dev->hpd_state;
 		}
-		/*CEC_ERR("port id:%d, sts:%d\n", a, tmp);*/
+		/*CEC_ERR("[HKTEST] port id:%d, sts:%d\n", a, tmp);*/
 		if (copy_to_user(argp, &tmp, _IOC_SIZE(cmd))) {
 			mutex_unlock(&cec_dev->cec_ioctl_mutex);
 			return -EINVAL;

project vendor/amlogic/common/
diff --git a/frameworks/services/hdmicec/libhdmi_cec/HdmiCecControl.cpp b/frameworks/services/hdmicec/libhdmi_cec/HdmiCecControl.cpp
old mode 100644
new mode 100755
index 31fca5d..784e747
--- a/frameworks/services/hdmicec/libhdmi_cec/HdmiCecControl.cpp
+++ b/frameworks/services/hdmicec/libhdmi_cec/HdmiCecControl.cpp
@@ -851,12 +851,15 @@ int HdmiCecControl::getPhysicalAddress(uint16_t* addr)
         return 0;
     }
 
+
+#if 0   /* HKTEST TEST */
     // Accelerate when playback is not connected to tv.
     if (mCecDevice.is_playback && (!mCecDevice.cec_connect_status)) {
         *addr = mCecDevice.phy_addr;
         LOGD("use %2x when not connected to tv", mCecDevice.phy_addr);
         return 0x1000;
     }
+#endif
 
     int ret = ioctl(mCecDevice.driver_fd, CEC_IOC_GET_PHYSICAL_ADDR, addr);
     LOGD("[hcc] %s, physical addr: %x, last pa: %x, ret = %d", __FUNCTION__,