Merge "[Bugfix][T106BUG-443]change reset sim error num"
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/include/telephony/ril.h b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/include/telephony/ril.h
index 8aaf524..75ad0a0 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/include/telephony/ril.h
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/include/telephony/ril.h
@@ -145,6 +145,17 @@
RIL_E_POWER_ON_UIM_NOT_READY = 7000,
// Power on end
//MTK end
+ RIL_E_SIM_PIN = 9200,
+
+ RIL_E_SIM_PUK,
+
+ RIL_E_SIM_LOCKED,
+
+ RIL_E_SIM_INIT_FAILED,
+
+ RIL_E_SIM_GLOBAL_PIN,
+
+ RIL_E_SIM_GLOBAL_PUK,
} RIL_Errno;
typedef enum {
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril.h b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril.h
index 8aaf524..75ad0a0 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril.h
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril.h
@@ -145,6 +145,17 @@
RIL_E_POWER_ON_UIM_NOT_READY = 7000,
// Power on end
//MTK end
+ RIL_E_SIM_PIN = 9200,
+
+ RIL_E_SIM_PUK,
+
+ RIL_E_SIM_LOCKED,
+
+ RIL_E_SIM_INIT_FAILED,
+
+ RIL_E_SIM_GLOBAL_PIN,
+
+ RIL_E_SIM_GLOBAL_PUK,
} RIL_Errno;
typedef enum {
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_sim.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_sim.c
index 3c67eff..bcc55ea 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_sim.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_sim.c
@@ -1140,9 +1140,16 @@
goto exit;
case 11: //need pin
+ RIL_onRequestComplete(token, RIL_E_SIM_PIN, NULL, 0);
+ goto error;
case 12: //need puk
+ RIL_onRequestComplete(token, RIL_E_SIM_PIN, NULL, 0);
+ goto error;
case 13: //sim locked
+ RIL_onRequestComplete(token, RIL_E_SIM_LOCKED, NULL, 0);
+ goto error;
case 15: //init fail
+ RIL_onRequestComplete(token, RIL_E_SIM_INIT_FAILED, NULL, 0);
goto error;
case 30: //init sucess
@@ -1151,7 +1158,11 @@
goto exit;
case 260: //need global pin
+ RIL_onRequestComplete(token, RIL_E_SIM_GLOBAL_PIN, NULL, 0);
+ goto error;
case 261: //need global puk
+ RIL_onRequestComplete(token, RIL_E_SIM_GLOBAL_PUK, NULL, 0);
+ goto error;
default:
goto error;
}
@@ -1159,8 +1170,8 @@
}
error:
- RLOGD("ril_request_radio_reset: failed!");
- RIL_onRequestComplete(token, RIL_E_GENERIC_FAILURE, NULL, 0);
+ RLOGD("ril_request_simcard_reset: failed!");
+ //RIL_onRequestComplete(token, RIL_E_GENERIC_FAILURE, NULL, 0);
updateRadioState();//if at error, we must update radio state
exit:
at_response_free(response);