From 0ef2b6c68080422bd4c55990f71d1907736658d6 Mon Sep 17 00:00:00 2001 From: Rakesh Pallerla Date: Mon, 28 Oct 2013 16:42:49 +0530 Subject: Support Additional SIM Depersonalizations Add support for Additional Depersonalization types. Added support for all ME De-Personalizations as per specs 3GPP2 C.S0068-0 and 3GPP TS 22.022. Change-Id: Ia2193e95cd7a6bdc4b224cef8b42285543a52361 --- include/telephony/ril.h | 9 +++++---- libril/ril.cpp | 2 +- libril/ril_commands.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/telephony/ril.h b/include/telephony/ril.h index 711d892..c703cd7 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -1362,12 +1362,13 @@ typedef struct { #define RIL_REQUEST_CHANGE_SIM_PIN2 7 /** - * RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION + * RIL_REQUEST_ENTER_DEPERSONALIZATION_CODE * - * Requests that network personlization be deactivated + * Requests that personlization be deactivated * * "data" is const char ** - * ((const char **)(data))[0]] is network depersonlization code + * ((const char **)(data))[0]] is personlization type + * ((const char **)(data))[1]] is depersonlization code * * "response" is int * * ((int *)response)[0] is the number of retries remaining, or -1 if unknown @@ -1381,7 +1382,7 @@ typedef struct { * (code is invalid) */ -#define RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION 8 +#define RIL_REQUEST_ENTER_DEPERSONALIZATION_CODE 8 /** * RIL_REQUEST_GET_CURRENT_CALLS diff --git a/libril/ril.cpp b/libril/ril.cpp index cb2d36f..7c0cb89 100755 --- a/libril/ril.cpp +++ b/libril/ril.cpp @@ -4569,7 +4569,7 @@ requestToString(int request) { case RIL_REQUEST_ENTER_SIM_PUK2: return "ENTER_SIM_PUK2"; case RIL_REQUEST_CHANGE_SIM_PIN: return "CHANGE_SIM_PIN"; case RIL_REQUEST_CHANGE_SIM_PIN2: return "CHANGE_SIM_PIN2"; - case RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION: return "ENTER_NETWORK_DEPERSONALIZATION"; + case RIL_REQUEST_ENTER_DEPERSONALIZATION_CODE: return "ENTER_DEPERSONALIZATION_CODE"; case RIL_REQUEST_GET_CURRENT_CALLS: return "GET_CURRENT_CALLS"; case RIL_REQUEST_DIAL: return "DIAL"; case RIL_REQUEST_GET_IMSI: return "GET_IMSI"; diff --git a/libril/ril_commands.h b/libril/ril_commands.h index 7c3af55..54b2579 100644 --- a/libril/ril_commands.h +++ b/libril/ril_commands.h @@ -22,7 +22,7 @@ {RIL_REQUEST_ENTER_SIM_PUK2, dispatchStrings, responseInts}, {RIL_REQUEST_CHANGE_SIM_PIN, dispatchStrings, responseInts}, {RIL_REQUEST_CHANGE_SIM_PIN2, dispatchStrings, responseInts}, - {RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION, dispatchStrings, responseInts}, + {RIL_REQUEST_ENTER_DEPERSONALIZATION_CODE, dispatchStrings, responseInts}, {RIL_REQUEST_GET_CURRENT_CALLS, dispatchVoid, responseCallList}, {RIL_REQUEST_DIAL, dispatchDial, responseVoid}, {RIL_REQUEST_GET_IMSI, dispatchStrings, responseString}, -- cgit v1.2.3