From 3b8d626796bf05d2a36501b5e5e4a6f11532b83b Mon Sep 17 00:00:00 2001 From: Firefly Date: Fri, 29 Jan 2016 10:11:24 +0800 Subject: [PATCH] =?UTF-8?q?[system/displayd]=20rk322x=20=E4=B8=8D=E7=94=A8?= =?UTF-8?q?SCREEN=5FTVOUT=5FTEST=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Firefly --- system/displayd/DisplayManager.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/system/displayd/DisplayManager.cpp b/system/displayd/DisplayManager.cpp index a63805504c..fc0c0ae0f6 100755 --- a/system/displayd/DisplayManager.cpp +++ b/system/displayd/DisplayManager.cpp @@ -180,9 +180,8 @@ void DisplayManager::init() { node->enable = 1; #ifdef DISPLAY_POLICY_BOX #ifdef RK3228 - if (node->type == DISPLAY_INTERFACE_TV && - ((type != SCREEN_TVOUT) || - (type != SCREEN_TVOUT_TEST))) { + if ((node->type == DISPLAY_INTERFACE_TV) && + (type != SCREEN_TVOUT)) { node->enable = 0; operateIfaceEnable(node, DISPLAY_OPERATE_WRITE); node->enable = 1; @@ -216,8 +215,7 @@ void DisplayManager::init() { if ((node->type == DISPLAY_INTERFACE_HDMI) && (node->connect == 1)) hdmiconnect = 1; if ((node->type == DISPLAY_INTERFACE_TV) && (node->enable == 1) && - ((type != SCREEN_TVOUT) || (type != SCREEN_TVOUT_TEST)) && - (hdmiconnect == 0)) { + (type != SCREEN_TVOUT) && (hdmiconnect == 0)) { node->enable = 0; operateIfaceEnable(node, DISPLAY_OPERATE_WRITE); node->enable = 1;