| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-11-07 08:23:51 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-11-07 08:23:51 (GMT) |
| commit | e8a55b271d8df784945faea90d7eac058af2da72 (patch) | |
| tree | 50187be486ca75765a4869dd5dd2d8e5b9ebad13 | |
| parent | c565959f8678df799a66e4d5891a09744b4817c3 (diff) | |
| parent | 34a5fb0a8540269ee5555ad872fa7e61d510b794 (diff) | |
| download | frameworks-e8a55b271d8df784945faea90d7eac058af2da72.zip frameworks-e8a55b271d8df784945faea90d7eac058af2da72.tar.gz frameworks-e8a55b271d8df784945faea90d7eac058af2da72.tar.bz2 | |
Merge "systemcontrol: clean up logo_index and fb0/free_scale_switch operation [2/3]" into o-amlogic
| -rw-r--r-- | services/systemcontrol/DisplayMode.cpp | 3 | ||||
| -rw-r--r-- | services/systemcontrol/DisplayMode.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/services/systemcontrol/DisplayMode.cpp b/services/systemcontrol/DisplayMode.cpp index 6569157..d92072b 100644 --- a/services/systemcontrol/DisplayMode.cpp +++ b/services/systemcontrol/DisplayMode.cpp @@ -937,7 +937,6 @@ void* DisplayMode::bootanimDetect(void* data) { usleep(1000 * 1000); } - pThiz->pSysWrite->writeSysfs(DISPLAY_LOGO_INDEX, "-1"); pThiz->pSysWrite->getPropertyString(PROP_BOOTVIDEO_SERVICE, bootvideo, "0"); SYS_LOGI("boot animation detect boot video:%s\n", bootvideo); if ((!strcmp(fs_mode, "recovery")) || (!strcmp(bootvideo, "1"))) { @@ -952,8 +951,6 @@ void* DisplayMode::bootanimDetect(void* data) { //open fb0, let bootanimation show in it pThiz->pSysWrite->writeSysfs(DISPLAY_FB0_BLANK, "0"); } - } else { - pThiz->pSysWrite->writeSysfs(DISPLAY_FB0_FREESCALE_SWTICH, "0x10001"); } pThiz->setOsdMouse(outputmode); diff --git a/services/systemcontrol/DisplayMode.h b/services/systemcontrol/DisplayMode.h index 91ba7ba..960b728 100644 --- a/services/systemcontrol/DisplayMode.h +++ b/services/systemcontrol/DisplayMode.h @@ -77,7 +77,6 @@ using namespace android; #define SYSFS_VIDEO_LAYER_STATE "/sys/class/video/video_layer1_state" #define DISPLAY_FB0_BLANK "/sys/class/graphics/fb0/blank" #define DISPLAY_FB1_BLANK "/sys/class/graphics/fb1/blank" -#define DISPLAY_LOGO_INDEX "/sys/module/fb/parameters/osd_logo_index" #define SYS_DISABLE_VIDEO "/sys/class/video/disable_video" #define DISPLAY_FB0_FREESCALE "/sys/class/graphics/fb0/free_scale" @@ -90,7 +89,6 @@ using namespace android; #define DISPLAY_FB0_FREESCALE_AXIS "/sys/class/graphics/fb0/free_scale_axis" #define DISPLAY_FB0_WINDOW_AXIS "/sys/class/graphics/fb0/window_axis" -#define DISPLAY_FB0_FREESCALE_SWTICH "/sys/class/graphics/fb0/free_scale_switch" #define DISPLAY_HDMI_HDCP14_STOP "stop14" //stop HDCP1.4 authenticate #define DISPLAY_HDMI_HDCP22_STOP "stop22" //stop HDCP2.2 authenticate |