[Bugfix][MD310/MD310EU][bug-view-977][button] Fix bug: After hibernation, pressing the WPS key will wake up WiFi
Change-Id: I502c0179d7946395b963724a7d48d81b59c50534
diff --git a/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_ctrl.c b/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_ctrl.c
index be83b05..a45c04b 100755
--- a/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_ctrl.c
+++ b/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_ctrl.c
@@ -236,7 +236,6 @@
mmi_putMutex(&g_mmi_ledmode_mutex);
}
-extern int g_wps_key_flag;
/**********************************************************************************
º¯Êý×÷ÓÃ:½«MMIÉèΪæµ״̬
***********************************************************************************/
@@ -245,21 +244,15 @@
if (g_showMode == MMI_MODE_LCD || g_showMode == MMI_MODE_ALL) {
E_zMmi_Work_Mode lcd_mode = mmi_get_lcd_mode();
if (lcd_mode == MMI_BACKLIGHT_OFF_MODE || lcd_mode == MMI_BACKLIGHT_HALFBRIGHT_MODE) {
- if (g_wps_key_flag != 1)
- {
- mmi_set_lcd_mode(MMI_ACTIVE_MODE);
- mmi_set_update_flag(MMI_TASK_CTRL);
- }
+ mmi_set_lcd_mode(MMI_ACTIVE_MODE);
+ mmi_set_update_flag(MMI_TASK_CTRL);
}
}
if (g_showMode == MMI_MODE_LED || g_showMode == MMI_MODE_ALL) {
E_zMmi_Work_Mode led_mode = mmi_get_led_mode();
if (led_mode == MMI_IDLE_LEDOFF_MODE || led_mode == MMI_IDLE_STANDBY_LEDOFF_MODE || led_mode == MMI_IDLE_CHG_LEDOFF_MODE) {
- if (g_wps_key_flag != 1)
- {
- mmi_set_led_mode(MMI_ACTIVE_MODE);
- mmi_set_update_flag(MMI_TASK_CTRL);
- }
+ mmi_set_led_mode(MMI_ACTIVE_MODE);
+ mmi_set_update_flag(MMI_TASK_CTRL);
}
}
}
diff --git a/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_keystrokes.c b/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_keystrokes.c
index 57528a1..12277ba 100755
--- a/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_keystrokes.c
+++ b/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_keystrokes.c
@@ -1,3 +1,4 @@
+
/*****************************************************************************
* °æ±¾ËùÓÐ (C)ÖÐÐËͨѶ¹É·ÝÓÐÏÞ¹«Ë¾
* Ä£¿éÃû £ºMMI
@@ -35,7 +36,6 @@
extern UINT32 g_fast_poweron;
static int g_mmi_kpd_longpress_time = 3;//³¤°´¼üÅжÏʱ¼äS
static int g_mmi_wifi_longpress_time = 5;//³¤°´wifi¼üÅжÏʱ¼äS, Ò¢Ô¶cpe
-int g_wps_key_flag = 0;
BOOL mmi_get_wakeup_flag(VOID);
/**********************************************************************************
@@ -292,7 +292,10 @@
slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI KEYUP KEYUP !!! longPress=%d key_wakeup=%d key_type:%d\n", longPress, key_wakeup, key_type);
slog(MMI_PRINT, SLOG_DEBUG, "*********************g_showMode:%d mmi_get_lcd_mode:%d ssidfirst:%d\n", g_showMode, mode, ssidfirst);
- mmi_wakeup_wifi(key_type);
+ if (key_type != KEY_TYPE_WPS)
+ {
+ mmi_wakeup_wifi(key_type);
+ }
cfg_get_item("sms_unread_count", unread_sms_conut, sizeof(unread_sms_conut));
#ifndef DISABLE_LCD
if (FALSE == longPress && (g_showMode == MMI_MODE_LCD || g_showMode == MMI_MODE_ALL)) {
@@ -486,15 +489,9 @@
case KEY_STATUS_DOWN: {
if (keyData.type != KEY_TYPE_WPS)
{
- g_wps_key_flag = 0;
mmi_handle_keystroke_down();
- break;
}
- else
- {
- g_wps_key_flag = 1;
- mmi_set_wakeup_flag(TRUE);
- }
+ break;
}
case KEY_STATUS_UP: {
mmi_handle_keystroke_up(keyData.type);
diff --git a/lynq/MD310EU/ap/app/zte_comm/zte_mmi/mmi_keystrokes.c b/lynq/MD310EU/ap/app/zte_comm/zte_mmi/mmi_keystrokes.c
index 9c34b84..8d2805e 100755
--- a/lynq/MD310EU/ap/app/zte_comm/zte_mmi/mmi_keystrokes.c
+++ b/lynq/MD310EU/ap/app/zte_comm/zte_mmi/mmi_keystrokes.c
@@ -286,7 +286,10 @@
BOOL key_wakeup = mmi_get_wakeup_flag();
slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI KEYUP KEYUP !!! longPress=%d key_wakeup=%d\n", longPress, key_wakeup);
- mmi_wakeup_wifi(key_type);
+ if (key_type != KEY_TYPE_WPS)
+ {
+ mmi_wakeup_wifi(key_type);
+ }
#ifndef DISABLE_LCD
if (FALSE == longPress && (g_showMode == MMI_MODE_LCD || g_showMode == MMI_MODE_ALL)) {
if (key_type == KEY_TYPE_POWER) {
@@ -431,8 +434,8 @@
if (keyData.type != KEY_TYPE_WPS)
{
mmi_handle_keystroke_down();
- break;
}
+ break;
}
case KEY_STATUS_UP: {
mmi_handle_keystroke_up(keyData.type);