Merge "project: msm8996: Add watch dog and disable dload properties on 8996 platform." into lk.lnx.1.0-dev.1.0
diff --git a/dev/gcdb/display/include/panel_hx8394f_720p_video.h b/dev/gcdb/display/include/panel_hx8394f_720p_video.h
index a3819b7..4442d3b 100644
--- a/dev/gcdb/display/include/panel_hx8394f_720p_video.h
+++ b/dev/gcdb/display/include/panel_hx8394f_720p_video.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -86,8 +86,8 @@
static char hx8394f_720p_video_on_cmd4[] = {
0x16, 0x00, 0x29, 0xC0,
0xB4, 0x6C, 0x6D, 0x6C,
- 0x6D, 0x6C, 0x6D, 0x01,
- 0x01, 0xFF, 0x75, 0x00,
+ 0x6A, 0x6C, 0x6D, 0x01,
+ 0x05, 0xFF, 0x77, 0x00,
0x3f, 0x6C, 0x6D, 0x6C,
0x6D, 0x6C, 0x6D, 0x01,
0x01, 0xFF, 0xFF, 0xFF,
diff --git a/platform/msm_shared/display_menu.c b/platform/msm_shared/display_menu.c
index 0fda310..abc7fac 100644
--- a/platform/msm_shared/display_menu.c
+++ b/platform/msm_shared/display_menu.c
@@ -51,14 +51,14 @@
"applications to stop working properly.\n\n"\
"To prevent unauthorized access to your personal data, "\
"unlocking the bootloader will also delete all personal "\
- "data from your phone(a \"fatory data reset\").\n\n"\
+ "data from your phone(a \"factory data reset\").\n\n"\
"Press the Volume Up/Down buttons to select Yes "\
"or No. Then press the Power button to continue.\n";
-#define YELLOW_WARNING_MSG "Your device has loaded a diffrent operating "\
+#define YELLOW_WARNING_MSG "Your device has loaded a different operating "\
"system\n\nTo learn more, visit:\n"
-#define ORANGE_WARNING_MSG "Your device has been unlocker and cann't "\
+#define ORANGE_WARNING_MSG "Your device has been unlocked and can't "\
"be trusted\n\nTo learn more, visit:\n"
#define RED_WARNING_MSG "Your device has failed verification and may "\
diff --git a/platform/msm_shared/smd.c b/platform/msm_shared/smd.c
index 6ead08e..7ebbcbd 100644
--- a/platform/msm_shared/smd.c
+++ b/platform/msm_shared/smd.c
@@ -433,7 +433,11 @@
if(ch->current_state == SMD_SS_CLOSED)
{
flush_smd_channel_entries();
- free(smd_channel_alloc_entry);
+ if(smd_channel_alloc_entry)
+ {
+ free(smd_channel_alloc_entry);
+ smd_channel_alloc_entry = NULL;
+ }
event_signal(&smd_closed, false);
return INT_NO_RESCHEDULE;
}
diff --git a/project/msm8952.mk b/project/msm8952.mk
index f0896ec..41f6e92 100644
--- a/project/msm8952.mk
+++ b/project/msm8952.mk
@@ -90,6 +90,9 @@
DEFINES += MDTP_SUPPORT=1
endif
+#Disable the dload mode
+DEFINES += DISABLE_DLOAD_MODE=0
+
ENABLE_WDOG_SUPPORT := 0
ifeq ($(ENABLE_WDOG_SUPPORT),1)
DEFINES += WDOG_SUPPORT=1