[TBT][tbtcoreapp][Non-ACR][SVACE fixes]

Change-Id: I321250fda0ffa87ae8155fe22ef3179919cf9ae5
Signed-off-by: Shilpa Jindal <shilpa.j@samsung.com>

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
old mode 100644 (file)
new mode 100755 (executable)
index ed22f82..7fc517d
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
old mode 100644 (file)
new mode 100755 (executable)
index cfd5a94..bdb95c2
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ

diff --git a/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c b/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c
old mode 100644 (file)
new mode 100755 (executable)
index 8f73c47..46228cb
--- a/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c
+++ b/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c
@@ -398,6 +398,7 @@ static void Bluetooth_adapter_device_discovery_state_changed_cb_p(int result, bt
        }
        else
        {
+               ui_utils_label_set_text(this->create_label, "Device Discovery Invoked, No Status yet", "left");
                switch ( discovery_state )
                {
                case BT_ADAPTER_DEVICE_DISCOVERY_STARTED:
@@ -409,10 +410,7 @@ static void Bluetooth_adapter_device_discovery_state_changed_cb_p(int result, bt
                case BT_ADAPTER_DEVICE_DISCOVERY_FOUND:
                                ui_utils_label_set_text(this->create_label, "Device Discovery Invoked, device is found", "left");
                                break;
-               default:
-                               ui_utils_label_set_text(this->create_label, "Device Discovery Invoked, No Status yet", "left");
-                               break;
-               }
+       }
        }
 }
 

diff --git a/tbtcoreapp/src/view/tbt-camera-view.c b/tbtcoreapp/src/view/tbt-camera-view.c
old mode 100644 (file)
new mode 100755 (executable)
index c742a28..ff87740
--- a/tbtcoreapp/src/view/tbt-camera-view.c
+++ b/tbtcoreapp/src/view/tbt-camera-view.c
@@ -524,10 +524,9 @@ char* get_camera_state(camera_state_e state)
                return "CAMERA_STATE_CAPTURING";
        case CAMERA_STATE_CAPTURED:
                return "CAMERA_STATE_CAPTURED";
-       default:
-               return "Unknown Error";
        }
 
+       return "Unknown Error";
 }
 
 /**

diff --git a/tbtcoreapp/src/view/tbt-connection-view.c b/tbtcoreapp/src/view/tbt-connection-view.c
index 76548606cb23977c6fd228d05182fc259859a234..86776f25eb0a9806b31b1e69c65e1f07b2913e61 100755 (executable)
--- a/tbtcoreapp/src/view/tbt-connection-view.c
+++ b/tbtcoreapp/src/view/tbt-connection-view.c
@@ -118,9 +118,6 @@ connection_view *connection_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_
                                        case CONNECTION_PROFILE_TYPE_BT:
                                                DBG("CONNECTION_PROFILE_TYPE_BT");
                                                break;
-                                       default:
-                                               DBG("Unknown");
-                                               break;
                                }
 
                                if ( eConnectionProfileType == CONNECTION_PROFILE_TYPE_CELLULAR )
@@ -136,7 +133,7 @@ connection_view *connection_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_
 
                result = connection_get_cellular_state(g_hConenctionHandle, &eFindCellularState);
                RETVM_IF(result != CONNECTION_ERROR_NONE, NULL, "connection_get_cellular_state fail > Error = %s", get_connection_error(result));
-
+               ui_utils_label_set_text(this->connection_label, "Unknown status", "left");
                        switch(eFindCellularState)
                        {
                                case CONNECTION_CELLULAR_STATE_OUT_OF_SERVICE:
@@ -150,23 +147,18 @@ connection_view *connection_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_
                                case CONNECTION_CELLULAR_STATE_ROAMING_OFF:
                                        ui_utils_label_set_text(this->connection_label, "Roaming is turned off ", "left");
                                        break;
-                       
+
                                case CONNECTION_CELLULAR_STATE_CALL_ONLY_AVAILABLE:
                                        ui_utils_label_set_text(this->connection_label, "Call is only available  ", "left");
                                        break;
-                       
+
                                case CONNECTION_CELLULAR_STATE_AVAILABLE:
                                        ui_utils_label_set_text(this->connection_label, "Available but not connected yet  ", "left");
                                        break;
-                       
+
                                case CONNECTION_CELLULAR_STATE_CONNECTED:
                                        ui_utils_label_set_text(this->connection_label, "Connected ", "left");
                                        break;
-
-                               default:
-                                       ui_utils_label_set_text(this->connection_label, "Unknown status", "left");
-                                       break;
-
                        }
                }
                else

diff --git a/tbtcoreapp/src/view/tbt-media-key-view.c b/tbtcoreapp/src/view/tbt-media-key-view.c
index c672be2b5a55a03695220e458dc3821782b505b3..9e34dc9c7ba9e94378f83ad061227a08002d4e88 100755 (executable)
--- a/tbtcoreapp/src/view/tbt-media-key-view.c
+++ b/tbtcoreapp/src/view/tbt-media-key-view.c
@@ -174,6 +174,7 @@ static void _media_key_event_cb(media_key_e key, media_key_event_e status, void
        }
        
        DBG("value: %d", key);
+       ui_utils_label_set_text(this->mediakey_label, "unknown state", "left");
        switch (key) 
        {
                case MEDIA_KEY_PLAY:
@@ -206,10 +207,7 @@ static void _media_key_event_cb(media_key_e key, media_key_event_e status, void
                case MEDIA_KEY_UNKNOWN:
                                ui_utils_label_set_text(this->mediakey2_label, "Unknown key", "left");
                                break;
-               default:
-                       ui_utils_label_set_text(this->mediakey_label, "unknown state", "left");
-                       break;
-       }
+               }
        return ;
 }
 

diff --git a/tbtcoreapp/src/view/tbt-nfc-view.c b/tbtcoreapp/src/view/tbt-nfc-view.c
old mode 100644 (file)
new mode 100755 (executable)
index 034259a..6ae0843
--- a/tbtcoreapp/src/view/tbt-nfc-view.c
+++ b/tbtcoreapp/src/view/tbt-nfc-view.c
@@ -890,7 +890,7 @@ void _nfc_p2p_data_received_cb(nfc_p2p_target_h target, nfc_ndef_message_h messa
  */
 static char* get_nfc_tag_name(nfc_tag_type_e type)
 {
-       char* type_name;
+       char* type_name = "UNKNOWN_TYPE";
 
 switch(type)
 {
@@ -955,9 +955,6 @@ switch(type)
        case NFC_NFCIP1_INITIATOR:
                type_name = "NFC_NFCIP1_INITIATOR";
                break;
-       default:
-               type_name = "UNKNOWN_TYPE";
-               break;
 
        }
        return type_name;

diff --git a/tbtcoreapp/src/view/tbt-package-manager-view.c b/tbtcoreapp/src/view/tbt-package-manager-view.c
index b19e275f8e5265ab1507c8a071bc4d3d639e41dc..20d148693d2d68914592364293fecee7b36afd4b 100755 (executable)
--- a/tbtcoreapp/src/view/tbt-package-manager-view.c
+++ b/tbtcoreapp/src/view/tbt-package-manager-view.c
@@ -184,6 +184,7 @@ static void _package_manager_event_cb(const char *type, const char *package, pac
                                ui_utils_label_set_text(this->packagemanager_label, "unknown state", "left");
                                break;
        }
+       ui_utils_label_set_text(this->packagemanagerstate_label, "unknown state", "left");
        switch(event_state)
        {
                case PACKAGE_MANAGER_EVENT_STATE_STARTED:
@@ -198,9 +199,6 @@ static void _package_manager_event_cb(const char *type, const char *package, pac
                case PACKAGE_MANAGER_EVENT_STATE_FAILED:
                                ui_utils_label_set_text(this->packagemanagerstate_label, "Failed event state", "left");
                                break;
-               default:
-                               ui_utils_label_set_text(this->packagemanagerstate_label, "unknown state", "left");
-                               break;
        }
        return ;
 }

diff --git a/tbtcoreapp/src/view/tbt-sound-manager-view.c b/tbtcoreapp/src/view/tbt-sound-manager-view.c
index a9a96f37b250a157594bb042cab37d273e3437fa..529f0a9eefcd89d706fc3c760596e3c07472bf75 100755 (executable)
--- a/tbtcoreapp/src/view/tbt-sound-manager-view.c
+++ b/tbtcoreapp/src/view/tbt-sound-manager-view.c
@@ -235,7 +235,7 @@ void _sound_device_information_changed_cb(sound_device_h device, sound_device_ch
        this = (soundmanager_view*) user_data;
 
        DBG("changed_info: %d", changed_info);
-
+       ui_utils_label_set_text(this->info_label, "Unknown status", "left");
        switch(changed_info)
        {
                case SOUND_DEVICE_CHANGED_INFO_STATE :
@@ -245,9 +245,6 @@ void _sound_device_information_changed_cb(sound_device_h device, sound_device_ch
                case SOUND_DEVICE_CHANGED_INFO_IO_DIRECTION:
                        ui_utils_label_set_text(this->info_label, "IO direction of the device was changed", "left");
                        break;
-               default:
-                       ui_utils_label_set_text(this->info_label, "Unknown status", "left");
-                       break;
        }
 
 }

diff --git a/tbtcoreapp/src/view/tbt-stt-view.c b/tbtcoreapp/src/view/tbt-stt-view.c
old mode 100644 (file)
new mode 100755 (executable)
index e25c233..924035a
--- a/tbtcoreapp/src/view/tbt-stt-view.c
+++ b/tbtcoreapp/src/view/tbt-stt-view.c
@@ -460,7 +460,7 @@ return err_msg;
 
 static char* get_stt_state_str(stt_state_e state)
 {
-       char* state_str;
+       char* state_str = "UNKNOWN_STATE";;
        switch (state)
        {
                case STT_STATE_CREATED:
@@ -475,9 +475,6 @@ static char* get_stt_state_str(stt_state_e state)
                case STT_STATE_PROCESSING:
                        state_str = "STT_STATE_PROCESSING";
                        break;
-               default:
-                       state_str = "UNKNOWN_STATE";
-                       break;
                }
        return state_str;
 }

diff --git a/tbtcoreapp/src/view/tbt-tts-view.c b/tbtcoreapp/src/view/tbt-tts-view.c
old mode 100644 (file)
new mode 100755 (executable)
index 914b1d4..94c95e9
--- a/tbtcoreapp/src/view/tbt-tts-view.c
+++ b/tbtcoreapp/src/view/tbt-tts-view.c
@@ -173,7 +173,7 @@ static void _tts_utterance_completed_cb(tts_h tts, int utt_id, void *user_data)
 static char* get_tts_state_str(tts_state_e state)
 {
 
-       char* state_str;
+       char* state_str = "UNKNOWN_STATE" ;
        switch(state)
        {
                case TTS_STATE_CREATED:
@@ -188,9 +188,6 @@ static char* get_tts_state_str(tts_state_e state)
                case TTS_STATE_PAUSED:
                        state_str = "TTS_STATE_PAUSED";
                        break;
-               default:
-                       state_str = "UNKNOWN_STATE";
-                       break;
        }
        return state_str;
 }