[Feature][T108][task-view-1499][ril]Modify return value GSW_HAL_FAIL to GSW_HAL_NORMAL_FAIL

Only Configure: No
Affected branch: GSW_V1453
Affected module: ril
Is it affected on IC: only ASR
Self-test: yes
Doc Update: no

Change-Id: I3d166729537a1a4863f797dc9a1d11e9cbfdddee
diff --git a/mbtk/libgsw_lib/gsw_nw.c b/mbtk/libgsw_lib/gsw_nw.c
index 18edcd9..9d5fda7 100755
--- a/mbtk/libgsw_lib/gsw_nw.c
+++ b/mbtk/libgsw_lib/gsw_nw.c
@@ -293,9 +293,6 @@
     int t_max;

 }GSW_NW_OOS_CONFIG_INFO_T;

 

-

-#define GSW_HAL_FAIL GSW_HAL_NORMAL_FAIL

-#define GSW_HAL_MEM_INVAILD GSW_HAL_ARG_INVALID

 #define lib_mbtk_path "/lib/libmbtk_lib.so"

 mbtk_info_handle_t*       nw_info_handle = NULL;

 

@@ -466,145 +463,145 @@
     dlHandle_mbtk = dlopen(lib_mbtk_path, RTLD_NOW);

     if (dlHandle_mbtk == NULL) 

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_log_init = (void (*)(char *path, char *tag))dlsym(dlHandle_mbtk, "mbtk_log_init");

     if (mbtk_log_init == NULL) 

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_log = (void (*)(int level, const char *format, ...))dlsym(dlHandle_mbtk, "mbtk_log");

     if (mbtk_log == NULL) 

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_info_handle_get = (mbtk_info_handle_t* (*)(void))dlsym(dlHandle_mbtk, "mbtk_info_handle_get");

     if (mbtk_info_handle_get == NULL) 

     {

         LOGE("mbtk_info_handle_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_info_handle_free = (int (*)(mbtk_info_handle_t** handle))dlsym(dlHandle_mbtk, "mbtk_info_handle_free");

     if (mbtk_info_handle_free == NULL) 

     {

         LOGE("mbtk_info_handle_free dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_net_sel_mode_get = (int (*)(mbtk_info_handle_t* handle, mbtk_net_info_t *net))dlsym(dlHandle_mbtk, "mbtk_net_sel_mode_get");

     if (mbtk_net_sel_mode_get == NULL) 

     {

         LOGE("mbtk_net_sel_mode_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_net_reg_get = (int (*)(mbtk_info_handle_t* handle, mbtk_net_reg_info_t *reg))dlsym(dlHandle_mbtk, "mbtk_net_reg_get");

     if (mbtk_net_reg_get == NULL) 

     {

         LOGE("mbtk_net_reg_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_get_modem_fun = (int (*)(mbtk_info_handle_t* handle, int* fun))dlsym(dlHandle_mbtk, "mbtk_get_modem_fun");

     if (mbtk_get_modem_fun == NULL) 

     {

         LOGE("mbtk_get_modem_fun dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_set_modem_fun = (int (*)(mbtk_info_handle_t* handle, mbtk_modem_info_t *info))dlsym(dlHandle_mbtk, "mbtk_set_modem_fun");

     if (mbtk_set_modem_fun == NULL) 

     {

         LOGE("mbtk_set_modem_fun dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_current_band_get = (int (*)(mbtk_info_handle_t* handle, mbtk_band_info_t *band))dlsym(dlHandle_mbtk, "mbtk_current_band_get");

     if (mbtk_current_band_get == NULL) 

     {

         LOGE("mbtk_current_band_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_current_band_set = (int (*)(mbtk_info_handle_t* handle, const mbtk_band_info_t *band))dlsym(dlHandle_mbtk, "mbtk_current_band_set");

     if (mbtk_current_band_set == NULL) 

     {

         LOGE("mbtk_current_band_set dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_net_signal_get = (int (*)(mbtk_info_handle_t* handle, mbtk_signal_info_t *signal))dlsym(dlHandle_mbtk, "mbtk_net_signal_get");

     if (mbtk_net_signal_get == NULL) 

     {

         LOGE("mbtk_net_signal_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_wakeup_state_set = (int (*)(mbtk_info_handle_t* handle, uint32 wakeup_state))dlsym(dlHandle_mbtk, "mbtk_wakeup_state_set");

     if (mbtk_wakeup_state_set == NULL) 

     {

         LOGE("mbtk_wakeup_state_set dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_cell_get = (int (*)(mbtk_info_handle_t* handle, mbtk_cell_type_enum *type, list_node_t **cell_list))dlsym(dlHandle_mbtk, "mbtk_cell_get");

     if (mbtk_cell_get == NULL) 

     {

         LOGE("mbtk_cell_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_signal_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_signal_state_change_cb_reg");

     if (mbtk_signal_state_change_cb_reg == NULL) 

     {

         LOGE("mbtk_signal_state_change_cb_reg dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_net_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_net_state_change_cb_reg");

     if (mbtk_net_state_change_cb_reg == NULL) 

     {

         LOGE("mbtk_net_state_change_cb_reg dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_fplmn_get = (int(*)(mbtk_info_handle_t *handle, void *fplmn))dlsym(dlHandle_mbtk, "mbtk_fplmn_get");

     if (mbtk_fplmn_get == NULL) 

     {

         LOGE("mbtk_fplmn_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_fplmn_set = (int(*)(mbtk_info_handle_t *handle, void *fplmn))dlsym(dlHandle_mbtk, "mbtk_fplmn_set");

     if (mbtk_fplmn_set == NULL) 

     {

         LOGE("mbtk_fplmn_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_radio_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_radio_state_change_cb_reg");

     if (mbtk_radio_state_change_cb_reg == NULL) 

     {

         LOGE("mbtk_radio_state_change_cb_reg dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_oos_get = (int (*)(mbtk_info_handle_t* handle, mbtk_oos_info *oos))dlsym(dlHandle_mbtk, "mbtk_oos_get");

     if (mbtk_oos_get == NULL) 

     {

         LOGE("mbtk_oos_get dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_oos_set = (int (*)(mbtk_info_handle_t* handle, mbtk_oos_info *oos))dlsym(dlHandle_mbtk, "mbtk_oos_set");

     if (mbtk_oos_set == NULL) 

     {

         LOGE("mbtk_oos_set dlsym fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     return GSW_HAL_SUCCESS;

@@ -1241,13 +1238,13 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(handle_ptr == NULL)

     {

         LOGE("handle_ptr is NULL\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     serving_cb = handle_ptr;

@@ -1267,13 +1264,13 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(handle_ptr == NULL)

     {

         LOGE("handle_ptr is NULL\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     sig_cb = handle_ptr;

@@ -1293,13 +1290,13 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(handle_ptr == NULL)

     {

         LOGE("handle_ptr is NULL\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     reject_cb = handle_ptr;

@@ -1317,6 +1314,7 @@
 int gsw_nw_sdk_init(int token)

 {

     int ret = -1;

+    pthread_t nw_info_thread;

 

     if (nw_init_flag == 1 && nw_info_handle != NULL)

     {

@@ -1327,7 +1325,7 @@
     if (ret != 0)

     {

         LOGE("mbtk_nw_api_import fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     nw_info_handle = mbtk_info_handle_get();

@@ -1335,7 +1333,7 @@
     if (nw_info_handle == NULL)

     {

         LOGE("mbtk_info_handle_get fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     char fplmn[256] = {0};

@@ -1343,7 +1341,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_fplmn_get failed : %d\n",ret);

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

     fplmn_max_length = (strlen(fplmn)/6);

     LOGE("fplmn = %s, fplmn_max_length = %d\n",fplmn,fplmn_max_length);

@@ -1352,14 +1350,14 @@
     if (ret != 0)

     {

         LOGE("mbtk_signal_state_change_cb_reg fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     ret = mbtk_net_state_change_cb_reg(nw_info_handle, gsw_serving_info_callback);

     if (ret != 0)

     {

         LOGE("mbtk_net_state_change_cb_reg fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     nw_init_flag = 1;

@@ -1380,14 +1378,14 @@
 

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     ret = mbtk_info_handle_free(&nw_info_handle);

     if(ret != GSW_HAL_SUCCESS)

     {

         LOGE("mbtk_info_handle_free fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     dlclose(dlHandle_mbtk);

@@ -1414,7 +1412,7 @@
     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

         LOGE("nw_sdk_deinit not init\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     LOGE("mbtk_net_reg_get start \n");

@@ -1425,7 +1423,7 @@
     if(ret)

     {

         LOGE("mbtk_net_reg_get fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     LOGE("convert_cs_reg_state\n");

@@ -1547,7 +1545,7 @@
     if(ret != 0 || cell_list == NULL)

     {

         LOGE("mbtk_cell_get fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

     else

     {

@@ -1620,7 +1618,7 @@
 

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     //regstate

@@ -1629,7 +1627,7 @@
     if(ret)

     {

         LOGE("mbtk_net_reg_get fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(reg.data_state == MBTK_NET_REG_STATE_HOME || reg.data_state == MBTK_NET_REG_STATE_ROAMING)

@@ -1657,14 +1655,14 @@
     int ret = -1;

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     ret = mbtk_get_modem_fun(nw_info_handle, &tmp_rf);

     if (ret != 0)

     {

         LOGE("mbtk_get_modem_fun fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

     if(tmp_rf == LYNQ_AIR_CFUN_MODE_OFF)

     {

@@ -1700,7 +1698,7 @@
 

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(op_mode == GSW_OP_MODE_LPM)

@@ -1721,7 +1719,7 @@
     if (rf_mode != LYNQ_AIR_PLANE_MODE_ON && rf_mode != LYNQ_AIR_PLANE_MODE_OFF && rf_mode != LYNQ_AIR_CFUN_MODE_OFF) 

     {

         LOGE("Input mode is error!\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     info.fun = rf_mode;

@@ -1730,7 +1728,7 @@
     if (ret != 0)

     {

         LOGE("gsw_set_opmode fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     return GSW_HAL_SUCCESS;

@@ -1749,7 +1747,7 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     int ret = -1;

@@ -1760,7 +1758,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_current_band_get fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     *mode_pref = convert_gsw_net_config(band.net_pref);

@@ -1768,7 +1766,7 @@
     if(*mode_pref <= 0)

     {

         LOGE("no support mode\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

     return GSW_HAL_SUCCESS;

 

@@ -1786,7 +1784,7 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     int ret = -1;

@@ -1800,14 +1798,14 @@
     if(band.net_pref < 0)

     {

         LOGE("no support mode\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     ret = mbtk_current_band_set(nw_info_handle, &band);

     if(ret != 0)

     {

         LOGE("mbtk_current_band_set fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     return GSW_HAL_SUCCESS;

@@ -1825,7 +1823,7 @@
 

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     mbtk_signal_info_t signal;

@@ -1834,7 +1832,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_net_signal_get fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     LOGD("signal.type=%d\n", signal.type);

@@ -1867,7 +1865,7 @@
         default:

         {

             LOGD("[%s] unknown reg type.[%d]\n", __func__, signal.type);

-            return GSW_HAL_FAIL;

+            return GSW_HAL_NORMAL_FAIL;

         }

     }

     return GSW_HAL_SUCCESS;

@@ -1885,13 +1883,13 @@
 

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(mode != 0 && mode != 1)

     {

         LOGE("Input mode is error!\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(mode == 1)

@@ -1903,7 +1901,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_wakeup_state_set fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     return GSW_HAL_SUCCESS;

@@ -1946,7 +1944,7 @@
         default:

         {

             LOGE("parameter error\n");

-            return GSW_HAL_FAIL;

+            return GSW_HAL_NORMAL_FAIL;

         }

     }

 }

@@ -1966,7 +1964,7 @@
 

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(!mbtk_net_sel_mode_get(nw_info_handle, &net) && net.plmn > 0)

@@ -2012,7 +2010,7 @@
     else

     {

         LOGE("mbtk_net_sel_mode_get fail\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     return GSW_HAL_SUCCESS;

@@ -2032,7 +2030,7 @@
     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

         LOGE("nw_sdk_deinit not init\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     list_node_t* cell_list = NULL;

@@ -2244,7 +2242,7 @@
 

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     int ret = -1;

@@ -2252,7 +2250,7 @@
     if(handle_ptr == NULL)

     {

         LOGE("handle_ptr is NULL\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     modem_cb = handle_ptr;

@@ -2261,7 +2259,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_radio_state_change_cb_reg failed : %d\n", ret);

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     return GSW_HAL_SUCCESS;

@@ -2279,7 +2277,7 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     int ret = -1;

@@ -2290,7 +2288,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_fplmn_get failed : %d\n",ret);

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     update_fplmn_list(fplmn);

@@ -2320,13 +2318,13 @@
 

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(plmn_list->plmn_list_len >= fplmn_max_length)

     {

         LOGE("can't save all the plmn\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     int i = 0;

@@ -2342,7 +2340,7 @@
             if((fplmn_index + plmn_list->plmn_list_len) > fplmn_max_length)

             {

                 LOGE("can't save all the plmn\n");

-                return GSW_HAL_FAIL;

+                return GSW_HAL_NORMAL_FAIL;

             }

 

             else

@@ -2370,7 +2368,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_fplmn_set failed : %d\n",ret);

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     LOGE("gsw_add_forbidden_networks exit\n");

@@ -2388,7 +2386,7 @@
     LOGE("gsw_remove_forbidden_networks enter\n");

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     int i = 0;

@@ -2420,7 +2418,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_fplmn_set failed : %d\n",ret);

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     LOGE("gsw_remove_forbidden_networks exit\n");

@@ -2437,7 +2435,7 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     char fplmn_str[FPLMN_STRING_LENGTH+1]; 

@@ -2449,7 +2447,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_fplmn_set failed : %d\n",ret);

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     return GSW_HAL_SUCCESS;

@@ -2465,13 +2463,13 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(pt_info == NULL)

     {

         LOGE("pt_info is null\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     int ret = -1;

@@ -2483,7 +2481,7 @@
     if(ret != 0)

     {

         LOGE("mbtk_oos_get failed : %d\n",ret);

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(oos_info.mode == 0)

@@ -2514,13 +2512,13 @@
 {

     if (nw_init_flag == 0 || nw_info_handle == NULL)

     {

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     if(pt_info == NULL)

     {

         LOGE("pt_info is null\n");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     int ret = -1;

@@ -2530,7 +2528,7 @@
     if (pt_info->t_min < 0 || pt_info->t_step < 0 || pt_info->t_max < 0)

     {

         LOGE("gsw_oos_config_set set time < 0 ");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

     else if ((pt_info->t_min > 0 && pt_info->t_min <= 255) && pt_info->t_step == 0 && pt_info->t_max == 0)

     {

@@ -2557,14 +2555,14 @@
     else

     {

         LOGE("gsw_oos_config_set set Format err");

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     ret = mbtk_oos_set(nw_info_handle, &oos_info);

     if(ret != 0)

     {

         LOGE("mbtk_oos_set failed : %d\n",ret);

-        return GSW_HAL_FAIL;

+        return GSW_HAL_NORMAL_FAIL;

     }

 

     return GSW_HAL_SUCCESS;