Merge "systemcontrol: clean up osd1 mouse op [1/3]" into o-amlogic

4 files changed, 1 insertions, 55 deletions

diff --git a/services/systemcontrol/DisplayMode.cpp b/services/systemcontrol/DisplayMode.cpp
index d92072b..a265c86 100644
--- a/services/systemcontrol/DisplayMode.cpp
+++ b/services/systemcontrol/DisplayMode.cpp
@@ -494,7 +494,6 @@ void DisplayMode::setSourceOutputMode(const char* outputmode, output_mode_state
         pSysWrite->writeSysfs(SYS_DISABLE_VIDEO, VIDEO_LAYER_ENABLE);
         pSysWrite->writeSysfs(DISPLAY_FB0_BLANK, "0");
         pSysWrite->writeSysfs(DISPLAY_FB0_FREESCALE, "0x10001");
-        setOsdMouse(outputmode);
     }
 
 #ifndef RECOVERY_MODE
@@ -953,7 +952,6 @@ void* DisplayMode::bootanimDetect(void* data) {
         }
     }
 
-    pThiz->setOsdMouse(outputmode);
     pThiz->pTxAuth->setBootAnimFinished(true);
     return NULL;
 }
@@ -1110,50 +1108,6 @@ void DisplayMode::updateWindowAxis(const char* outputmode) {
     pSysWrite->writeSysfs(DISPLAY_FB0_WINDOW_AXIS, axis);
 }
 
-void DisplayMode::setOsdMouse(const char* curMode) {
-    //SYS_LOGI("set osd mouse mode: %s", curMode);
-
-    int position[4] = { 0, 0, 0, 0 };//x,y,w,h
-    getPosition(curMode, position);
-    setOsdMouse(position[0], position[1], position[2], position[3]);
-}
-
-void DisplayMode::setOsdMouse(int x, int y, int w, int h) {
-    SYS_LOGI("set osd mouse x:%d y:%d w:%d h:%d", x, y, w, h);
-
-    const char* displaySize = "1920 1080";
-    int display_w, display_h;
-    if (!strncmp(mDefaultUI, "720", 3)) {
-        displaySize = "1280 720";
-    } else if (!strncmp(mDefaultUI, "1080", 4)) {
-        displaySize = "1920 1080";
-    } else if (!strncmp(mDefaultUI, "4k2k", 4)) {
-        displaySize = "3840 2160";
-    }
-
-    char cur_mode[MODE_LEN] = {0};
-    pSysWrite->readSysfs(SYSFS_DISPLAY_MODE, cur_mode);
-    if (!strcmp(cur_mode, MODE_480I) || !strcmp(cur_mode, MODE_576I) ||
-            !strcmp(cur_mode, MODE_480CVBS) || !strcmp(cur_mode, MODE_576CVBS) ||
-            !strcmp(cur_mode, MODE_1080I50HZ) || !strcmp(cur_mode, MODE_1080I)) {
-        y /= 2;
-        h /= 2;
-    }
-
-    char axis[512] = {0};
-    sprintf(axis, "%d %d %s %d %d 18 18", x, y, displaySize, x, y);
-    pSysWrite->writeSysfs(SYSFS_DISPLAY_AXIS, axis);
-
-    sprintf(axis, "%s %d %d", displaySize, w, h);
-    sscanf(displaySize,"%d %d",&display_w,&display_h);
-    pSysWrite->writeSysfs(DISPLAY_FB1_SCALE_AXIS, axis);
-    if ((display_w != w) || (display_h != h)) {
-        pSysWrite->writeSysfs(DISPLAY_FB1_SCALE, "0x10001");
-    } else {
-        pSysWrite->writeSysfs(DISPLAY_FB1_SCALE, "0");
-    }
-}
-
 void DisplayMode::getPosition(const char* curMode, int *position) {
     char keyValue[20] = {0};
     char ubootvar[100] = {0};
diff --git a/services/systemcontrol/DisplayMode.h b/services/systemcontrol/DisplayMode.h
index 960b728..bb6fbb3 100644
--- a/services/systemcontrol/DisplayMode.h
+++ b/services/systemcontrol/DisplayMode.h
@@ -71,7 +71,6 @@ using namespace android;
 #define SYSFS_DISPLAY_MODE2             "/sys/class/display2/mode"
 //when close freescale, will enable display axis, cut framebuffer output
 //when open freescale, will enable window axis, scale framebuffer output
-#define SYSFS_DISPLAY_AXIS              "/sys/class/display/axis"
 #define SYSFS_VIDEO_AXIS                "/sys/class/video/axis"
 #define SYSFS_BOOT_TYPE                 "/sys/power/boot_type"
 #define SYSFS_VIDEO_LAYER_STATE         "/sys/class/video/video_layer1_state"
@@ -84,8 +83,7 @@ using namespace android;
 #define DISPLAY_FB0_FREESCALE_MODE      "/sys/class/graphics/fb0/freescale_mode"
 #define DISPLAY_FB1_FREESCALE_MODE      "/sys/class/graphics/fb1/freescale_mode"
 #define DISPLAY_FB0_SCALE_AXIS          "/sys/class/graphics/fb0/scale_axis"
-#define DISPLAY_FB1_SCALE_AXIS          "/sys/class/graphics/fb1/scale_axis"
-#define DISPLAY_FB1_SCALE               "/sys/class/graphics/fb1/scale"
+
 
 #define DISPLAY_FB0_FREESCALE_AXIS      "/sys/class/graphics/fb0/free_scale_axis"
 #define DISPLAY_FB0_WINDOW_AXIS         "/sys/class/graphics/fb0/window_axis"
@@ -391,8 +389,6 @@ public:
     void setSourceOutputMode(const char* outputmode);
     void setSinkOutputMode(const char* outputmode);
     void setDigitalMode(const char* mode);
-    void setOsdMouse(const char* curMode);
-    void setOsdMouse(int x, int y, int w, int h);
     void setPosition(int left, int top, int width, int height);
     void getPosition(const char* curMode, int *position);
     void setDolbyVisionEnable(int state);
diff --git a/services/systemcontrol/SystemControl.cpp b/services/systemcontrol/SystemControl.cpp
index 6f3d4f1..ec5997b 100644
--- a/services/systemcontrol/SystemControl.cpp
+++ b/services/systemcontrol/SystemControl.cpp
@@ -407,14 +407,12 @@ void SystemControl::setOsdMouseMode(const String16& mode) {
         ALOGI("set osd mouse mode :%s", String8(mode).string());
     }
 
-    pDisplayMode->setOsdMouse(String8(mode).string());
 }
 
 void SystemControl::setOsdMousePara(int x, int y, int w, int h) {
     if (mLogLevel > LOG_LEVEL_1) {
         ALOGI("set osd mouse parameter x:%d y:%d w:%d h:%d", x, y, w, h);
     }
-    pDisplayMode->setOsdMouse(x, y, w, h);
 }
 
 void SystemControl::setPosition(int left, int top, int width, int height) {
diff --git a/services/systemcontrol/SystemControlService.cpp b/services/systemcontrol/SystemControlService.cpp
index ae4d0de..c2fe7ec 100644
--- a/services/systemcontrol/SystemControlService.cpp
+++ b/services/systemcontrol/SystemControlService.cpp
@@ -339,14 +339,12 @@ void SystemControlService::setOsdMouseMode(const std::string& mode) {
         ALOGI("set osd mouse mode :%s", mode.c_str());
     }
 
-    pDisplayMode->setOsdMouse(mode.c_str());
 }
 
 void SystemControlService::setOsdMousePara(int x, int y, int w, int h) {
     if (mLogLevel > LOG_LEVEL_1) {
         ALOGI("set osd mouse parameter x:%d y:%d w:%d h:%d", x, y, w, h);
     }
-    pDisplayMode->setOsdMouse(x, y, w, h);
 }
 
 void SystemControlService::setPosition(int left, int top, int width, int height) {