Fix docstrings for RIL_CellIdentity
am: ae339b3feb
Change-Id: Ib216d068ab39f9eb0c7f4841a26eba7d8bca918c
diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 0512f52..1c29fd3 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -2401,6 +2401,7 @@
* RADIO_NOT_AVAILABLE (radio resetting)
* PASSWORD_INCORRECT
* (code is invalid)
+ * SIM_ABSENT
* INTERNAL_ERR
* NO_MEMORY
* NO_RESOURCES
@@ -2926,6 +2927,8 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * MODE_NOT_SUPPORTED
+ * SIM_ABSENT
*
* FIXME how do we specify TP-Message-Reference if we need to resend?
*/
@@ -2972,6 +2975,8 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * MODE_NOT_SUPPORTED
+ * SIM_ABSENT
*
*/
#define RIL_REQUEST_SEND_SMS_EXPECT_MORE 26
@@ -3048,8 +3053,8 @@
* Other errors could include:
* RADIO_NOT_AVAILABLE, OP_NOT_ALLOWED_BEFORE_REG_TO_NW,
* OP_NOT_ALLOWED_DURING_VOICE_CALL, REQUEST_NOT_SUPPORTED,
- * INVALID_ARGUMENTS, INTERNAL_ERR, NO_MEMORY, NO_RESOURCES
- * and CANCELLED
+ * INVALID_ARGUMENTS, INTERNAL_ERR, NO_MEMORY, NO_RESOURCES,
+ * SIM_ABSENT and CANCELLED
*
* See also: RIL_REQUEST_DEACTIVATE_DATA_CALL
*/
@@ -3475,6 +3480,7 @@
* NO_MEMORY
* NO_RESOURCES
* CANCELLED
+ * SIM_ABSENT
*
* See also: RIL_REQUEST_SETUP_DATA_CALL
*/
@@ -3975,6 +3981,7 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*
* See also: RIL_UNSOL_DATA_CALL_LIST_CHANGED
*/
@@ -4144,6 +4151,7 @@
* CANCELLED
* INVALID_MODEM_STATE
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*
*/
#define RIL_REQUEST_WRITE_SMS_TO_SIM 63
@@ -4172,6 +4180,7 @@
* CANCELLED
* INVALID_MODEM_STATE
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*
*/
#define RIL_REQUEST_DELETE_SMS_ON_SIM 64
@@ -4801,6 +4810,8 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * MODE_NOT_SUPPORTED
+ * SIM_ABSENT
*
*/
#define RIL_REQUEST_CDMA_SEND_SMS 87
@@ -5075,6 +5086,7 @@
* CANCELLED
* INVALID_MODEM_STATE
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*
*/
#define RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM 96
@@ -5103,7 +5115,7 @@
* CANCELLED
* INVALID_MODEM_STATE
* REQUEST_NOT_SUPPORTED
- *
+ * SIM_ABSENT
*/
#define RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM 97
@@ -5194,6 +5206,7 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*
*/
#define RIL_REQUEST_GET_SMSC_ADDRESS 100
@@ -5220,7 +5233,7 @@
* INTERNAL_ERR
* CANCELLED
* REQUEST_NOT_SUPPORTED
- *
+ * SIM_ABSENT
*/
#define RIL_REQUEST_SET_SMSC_ADDRESS 101
@@ -5372,6 +5385,7 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*/
#define RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS 107
@@ -5888,6 +5902,7 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*/
#define RIL_REQUEST_SET_DATA_PROFILE 128
@@ -5981,6 +5996,7 @@
* NO_MEMORY
* NO_RESOURCES
* CANCELLED
+ * SIM_ABSENT
*/
#define RIL_REQUEST_START_LCE 132
@@ -6001,6 +6017,7 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*/
#define RIL_REQUEST_STOP_LCE 133
@@ -6020,6 +6037,7 @@
* NO_RESOURCES
* CANCELLED
* REQUEST_NOT_SUPPORTED
+ * SIM_ABSENT
*/
#define RIL_REQUEST_PULL_LCEDATA 134
diff --git a/libril/Android.mk b/libril/Android.mk
index 5264a81..681e3c4 100644
--- a/libril/Android.mk
+++ b/libril/Android.mk
@@ -40,7 +40,6 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_MODULE:= libril
-LOCAL_CLANG := true
LOCAL_SANITIZE := integer
include $(BUILD_SHARED_LIBRARY)
diff --git a/libril/RilSapSocket.cpp b/libril/RilSapSocket.cpp
index cf99773..664e6a9 100644
--- a/libril/RilSapSocket.cpp
+++ b/libril/RilSapSocket.cpp
@@ -112,7 +112,7 @@
}
void RilSapSocket::initSapSocket(const char *socketName,
- RIL_RadioFunctions *uimFuncs) {
+ const RIL_RadioFunctions *uimFuncs) {
if (strcmp(socketName, RIL1_SERVICE_NAME) == 0) {
if(!SocketExists(socketName)) {
@@ -146,7 +146,7 @@
}
void RilSapSocket::addSocketToList(const char *socketName, RIL_SOCKET_ID socketid,
- RIL_RadioFunctions *uimFuncs) {
+ const RIL_RadioFunctions *uimFuncs) {
RilSapSocket* socket = NULL;
RilSapSocketList *current;
@@ -191,7 +191,7 @@
RilSapSocket::RilSapSocket(const char *socketName,
RIL_SOCKET_ID socketId,
- RIL_RadioFunctions *inputUimFuncs):
+ const RIL_RadioFunctions *inputUimFuncs):
RilSocket(socketName, socketId) {
if (inputUimFuncs) {
uimFuncs = inputUimFuncs;
@@ -287,4 +287,4 @@
sap::processUnsolResponse(&rsp, this);
free(payload);
}
-}
\ No newline at end of file
+}
diff --git a/libril/RilSapSocket.h b/libril/RilSapSocket.h
index 8c8c4bc..1a816c5 100644
--- a/libril/RilSapSocket.h
+++ b/libril/RilSapSocket.h
@@ -39,7 +39,7 @@
* Place holder for the radio functions returned by the initialization
* function. Currenty only onRequest handler is being used.
*/
- RIL_RadioFunctions* uimFuncs;
+ const RIL_RadioFunctions* uimFuncs;
/**
* Wrapper struct for handling the requests in the queue.
@@ -69,7 +69,7 @@
* @param Radio functions to be used by the socket.
*/
static void initSapSocket(const char *socketName,
- RIL_RadioFunctions *uimFuncs);
+ const RIL_RadioFunctions *uimFuncs);
/**
* Ril envoronment variable that holds the request and
@@ -137,7 +137,7 @@
* and add socket to the socket list.
*/
static void addSocketToList(const char *socketName, RIL_SOCKET_ID socketid,
- RIL_RadioFunctions *uimFuncs);
+ const RIL_RadioFunctions *uimFuncs);
/**
* Check if a socket of the given name exists in the socket list.
@@ -157,7 +157,7 @@
*/
RilSapSocket(const char *socketName,
RIL_SOCKET_ID socketId,
- RIL_RadioFunctions *inputUimFuncs);
+ const RIL_RadioFunctions *inputUimFuncs);
/**
* Class method that selects the socket on which the onRequestComplete
diff --git a/libril/ril.cpp b/libril/ril.cpp
index 6d375ca..52d574d 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -195,11 +195,6 @@
return ril_service_name;
}
-extern "C"
-void RIL_setServiceName(const char * s) {
- strncpy(ril_service_name, s, MAX_SERVICE_NAME_LENGTH);
-}
-
RequestInfo *
addRequestToList(int serial, int slotId, int request) {
RequestInfo *pRI;
@@ -459,10 +454,10 @@
}
extern "C" void
-RIL_register_socket (RIL_RadioFunctions *(*Init)(const struct RIL_Env *, int, char **),
+RIL_register_socket (const RIL_RadioFunctions *(*Init)(const struct RIL_Env *, int, char **),
RIL_SOCKET_TYPE socketType, int argc, char **argv) {
- RIL_RadioFunctions* UimFuncs = NULL;
+ const RIL_RadioFunctions* UimFuncs = NULL;
if(Init) {
UimFuncs = Init(&RilSapSocket::uimRilEnv, argc, argv);
diff --git a/libril/sap_service.cpp b/libril/sap_service.cpp
index ee04afb..b945174 100644
--- a/libril/sap_service.cpp
+++ b/libril/sap_service.cpp
@@ -921,7 +921,7 @@
processResponse(rsp, sapSocket, MsgType_UNSOL_RESPONSE);
}
-void sap::registerService(RIL_RadioFunctions *callbacks) {
+void sap::registerService(const RIL_RadioFunctions *callbacks) {
using namespace android::hardware;
int simCount = 1;
const char *serviceNames[] = {
diff --git a/libril/sap_service.h b/libril/sap_service.h
index afed612..cb5ae10 100644
--- a/libril/sap_service.h
+++ b/libril/sap_service.h
@@ -24,10 +24,10 @@
namespace sap {
-void registerService(RIL_RadioFunctions *callbacks);
+void registerService(const RIL_RadioFunctions *callbacks);
void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket);
void processUnsolResponse(MsgHeader *rsp, RilSapSocket *sapSocket);
} // namespace android
-#endif // RIL_SERVICE_H
\ No newline at end of file
+#endif // RIL_SERVICE_H
diff --git a/rild/rild.c b/rild/rild.c
index 7158c44..dbd925d 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -50,7 +50,7 @@
extern void RIL_register (const RIL_RadioFunctions *callbacks);
extern void rilc_thread_pool ();
-extern void RIL_register_socket (RIL_RadioFunctions *(*rilUimInit)
+extern void RIL_register_socket (const RIL_RadioFunctions *(*rilUimInit)
(const struct RIL_Env *, int, char **), RIL_SOCKET_TYPE socketType, int argc, char **argv);
extern void RIL_onRequestComplete(RIL_Token t, RIL_Errno e,
@@ -58,8 +58,6 @@
extern void RIL_onRequestAck(RIL_Token t);
-extern void RIL_setServiceName(char *);
-
#if defined(ANDROID_MULTI_SIM)
extern void RIL_onUnsolicitedResponse(int unsolResponse, const void *data,
size_t datalen, RIL_SOCKET_ID socket_id);
@@ -105,7 +103,7 @@
// Pointer to ril init function in vendor ril
const RIL_RadioFunctions *(*rilInit)(const struct RIL_Env *, int, char **);
// Pointer to sap init function in vendor ril
- RIL_RadioFunctions *(*rilUimInit)(const struct RIL_Env *, int, char **);
+ const RIL_RadioFunctions *(*rilUimInit)(const struct RIL_Env *, int, char **);
const char *err_str = NULL;
// functions returned by ril init function in vendor ril
@@ -148,7 +146,6 @@
if (strncmp(clientId, "0", MAX_CLIENT_ID_LENGTH)) {
strncpy(ril_service_name, ril_service_name_base, MAX_SERVICE_NAME_LENGTH);
strncat(ril_service_name, clientId, MAX_SERVICE_NAME_LENGTH);
- RIL_setServiceName(ril_service_name);
}
if (rilLibPath == NULL) {
@@ -181,7 +178,7 @@
dlerror(); // Clear any previous dlerror
rilUimInit =
- (RIL_RadioFunctions *(*)(const struct RIL_Env *, int, char **))
+ (const RIL_RadioFunctions *(*)(const struct RIL_Env *, int, char **))
dlsym(dlHandle, "RIL_SAP_Init");
err_str = dlerror();
if (err_str) {