Fix the problem that network icon is made on BT after flight mode off

Change-Id: I55f3d72decc856b520f665f3fe8291ded9cd778b

diff --git a/src/moments/moments_manager.c b/src/moments/moments_manager.c
index 762cc20afd8afcc9fe6d2914d198c11d2ff0a75e..02d1e9305f7d08a7855352dd8fbd5d251e2cabd6 100755 (executable)
--- a/src/moments/moments_manager.c
+++ b/src/moments/moments_manager.c
@@ -411,10 +411,12 @@ static void __network_enable(void)
                __wifi_state_changed_cb(NULL, NULL);
                return;
        } else {
-               __get_network_strength_and_packet_type(&network_type, &packet_type);
+               if (moments_check_is_3g_device()) {
+                       moments_status_network_icon_show();
+                       __get_network_strength_and_packet_type(&network_type, &packet_type);
+                       moments_status_network_update(network_type, network_type == 0 ? network_type : packet_type+15);
+               }
        }
-
-       moments_status_network_update(network_type, network_type == 0 ? network_type : packet_type+15);
 }
 static void __network_disable(void)
 {
@@ -456,8 +458,6 @@ static void __flight_mode_changed_cb(keynode_t *node, void *user_data)
                if (moments_check_is_3g_device()) {
                        __callsignal_enable();
                        __callforwarding_state_changed_cb(NULL, NULL);
-               } else {
-                       moments_status_network_icon_show();
                }
                __network_enable();
                __bluetooth_state_changed_cb(NULL, NULL);