Fix for TREL-380 (TZSP-5141): - Change flight mode status being checked before prepar...

  - Update VConf-value of flight-mode after, flight-mode is acknowledged from modem
    Fix is corresponding to Philippe Nunes's comment in https://tizendev.org/gerrit/#/c/66488/

Change-Id: I62113f6eb770cb4f7c8c17d7942e92e01aa45e79

diff --git a/call-engine/core/vc-core-engine.c b/call-engine/core/vc-core-engine.c
index 2622ec1cbdb8def9d1d38761b20b06045e694270..027b5b75ad155a2bd15d0f7bed7139a840bc775c 100755 (executable)
--- a/call-engine/core/vc-core-engine.c
+++ b/call-engine/core/vc-core-engine.c
@@ -3160,6 +3160,7 @@ static void __vc_core_engine_tapi_event_flight_mode_cb(TapiHandle *handle, int r
        switch (result) {
        case TAPI_POWER_FLIGHT_MODE_RESP_OFF:
                /*Flight mode is disabled.. make a new call*/
+               vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, FALSE);
                _vc_core_ca_send_event_to_client(pagent, VC_CALL_FLIGHT_MODE_DISABLED, -1, -1, NULL);
                break;
 

diff --git a/call-engine/voice-call-core.c b/call-engine/voice-call-core.c
index 330c898a7e72303d87c1b907316326add63b204b..1fa6476608d780ab76e76cd142d758b15b1df155 100755 (executable)
--- a/call-engine/voice-call-core.c
+++ b/call-engine/voice-call-core.c
@@ -1987,6 +1987,26 @@ gboolean voicecall_core_setup_call(call_vc_core_state_t *pcall_core, gboolean be
                return FALSE;
        }
 
+       /*Check flight mode enabled/disabled*/
+       int flight_mode = -1;
+       if (voicecall_service_get_flight_mode_setting(&flight_mode)) {
+               CALL_ENG_DEBUG(ENG_DEBUG, "flight_mode: %d", flight_mode);
+
+               if (flight_mode) {
+                       /*Show popup in UI - call not allowed*/
+                       vc_engine_msg_box_type event_data;
+
+                       memset(&event_data, 0, sizeof(event_data));
+                       event_data.string_id = IDS_CALL_POP_FM_DISABLE_MSG;
+                       vcall_engine_send_event_to_client(VC_ENGINE_MSG_MESSAGE_BOX_TO_UI, (void *)&event_data);
+
+                       return VCALL_ENGINE_API_FLIGHT_MODE_DISABLE_REQUEST;
+               }
+       } else {
+               LOGE("-------------------------------FLIGHT_MODE API FAILED... \n");
+               CALL_ENG_DEBUG(ENG_DEBUG, "flight-mode API failed...");
+       }
+
        /*Prpare a call with the Voicecall Engine */
        setupcall_info.call_type = pcall_core->call_setup_info.call_type;
        _vc_core_util_strcpy(setupcall_info.source_tel_number, sizeof(setupcall_info.source_tel_number), pcall_core->call_setup_info.source_tel_number);
@@ -2013,25 +2033,6 @@ gboolean voicecall_core_setup_call(call_vc_core_state_t *pcall_core, gboolean be
                return FALSE;
        }
 
-       /*Check flight mode enabled/disabled*/
-       int flight_mode = -1;
-       if (voicecall_service_get_flight_mode_setting(&flight_mode)) {
-               CALL_ENG_DEBUG(ENG_DEBUG, "flight_mode: %d", flight_mode);
-
-               if (flight_mode) {
-                       /*Show popup in UI - call not allowed*/
-                       vc_engine_msg_box_type event_data;
-
-                       memset(&event_data, 0, sizeof(event_data));
-                       event_data.string_id = IDS_CALL_POP_FM_DISABLE_MSG;
-                       vcall_engine_send_event_to_client(VC_ENGINE_MSG_MESSAGE_BOX_TO_UI, (void *)&event_data);
-
-                       return VCALL_ENGINE_API_FLIGHT_MODE_DISABLE_REQUEST;
-               }
-       } else {
-               CALL_ENG_DEBUG(ENG_DEBUG, "flight-mode API failed...");
-       }
-
        pcall_core->call_setup_info.call_type = setupcall_info.call_type;
        CALL_ENG_DEBUG(ENG_DEBUG, "call_type:[%d]", pcall_core->call_setup_info.call_type);
 

diff --git a/packaging/org.tizen.call.changes b/packaging/org.tizen.call.changes
new file mode 100644 (file)
index 0000000..06f2931
--- /dev/null
+++ b/packaging/org.tizen.call.changes
@@ -0,0 +1,3 @@
+* Mon May 27 2013 Petteri Tikander <juhax.p.tikander@intel.com> submit/tizen_2.1/20130510.122159@31af7dd
+- Fix for TREL-380 (TZSP-5141):   - Change flight mode status being checked before preparing the call.
+- - Add missing vconf update. Updated after getting acknowledge from the telephony.