Bug 1083650 - Part 1: Support RIL_REQUEST_QUERY_FACILITY_LOCK. r=hsinyi

mozilla-b2g · Nov 17, 2014 · edde94f · edde94f
1 parent cd88d86
commit edde94f
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 0 deletions.
diff --git a/reference-ril/atchannel.h b/reference-ril/atchannel.h
@@ -112,7 +112,9 @@ void at_response_free(ATResponse *p_response);
 typedef enum {
     CME_ERROR_NON_CME = -1,
     CME_SUCCESS = 0,
+    CME_OPERATION_NOT_SUPPORTED = 4,
     CME_SIM_NOT_INSERTED = 10,
+    CME_INCORRECT_PASSWORD = 16,
     CME_NO_NETWORK_SERVICE = 30
 } AT_CME_Error;
 

diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
@@ -253,6 +253,21 @@ static int query_ctec(ModemInfo *mdm, int *current, int32_t *preferred);
 static int parse_technology_response(const char *response, int *current, int32_t *preferred);
 static int techFromModemType(int mdmtype);
 
+static int cmeErrorToRilError(int cmeError) {
+    switch (cmeError) {
+        case CME_SUCCESS:
+            return RIL_E_SUCCESS;
+        case CME_OPERATION_NOT_SUPPORTED:
+            return RIL_E_REQUEST_NOT_SUPPORTED;
+        case CME_SIM_NOT_INSERTED:
+            return RIL_E_SIM_ABSENT;
+        case CME_INCORRECT_PASSWORD:
+            return RIL_E_PASSWORD_INCORRECT;
+    }
+
+    return RIL_E_GENERIC_FAILURE;
+}
+
 static int clccStateToRILState(int state, RIL_CallState *p_state)
 
 {
@@ -2733,6 +2748,65 @@ static void requestSetCallForward(void* data, size_t datalen, RIL_Token t)
     at_response_free(p_response);
 }
 
+static void requestQueryFacilityLock(void* data, size_t datalen, RIL_Token t)
+{
+    ATResponse   *p_response = NULL;
+    ATLine       *p_cur;
+    int           err;
+    char*         cmd = NULL;
+    const char**  strings = (const char**)data;
+    int           serviceClass = 0;
+
+    // Query facility lock. AT+CLCK=<fac>,<mode>[,<password>[,<class>]]
+    asprintf(&cmd, "AT+CLCK=\"%s\",2,\"%s\",%d", strings[0], strings[1], atoi(strings[2]));
+    err = at_send_command_multiline(cmd, "+CLCK:", &p_response);
+    free(cmd);
+
+    if (err < 0 || p_response->success == 0) {
+        goto error;
+    }
+
+    // Parse the AT command result. +CLCK: <status>[,<class>]
+    for (p_cur = p_response->p_intermediates; p_cur != NULL;
+         p_cur = p_cur->p_next) {
+        char *line = p_cur->line;
+        int status;
+        int class;
+
+        err = at_tok_start(&line);
+        if (err < 0) {
+            goto error;
+        }
+
+        // Get <status>
+        if (at_tok_nextint(&line, &status) < 0) {
+            goto error;
+        }
+
+        if (!at_tok_hasmore(&line)) {
+            continue;
+        }
+
+        // Get <class>
+        if (at_tok_nextint(&line, &class) < 0) {
+            goto error;
+        }
+
+        if (status == 1) {
+            serviceClass |= class;
+        }
+    }
+
+    RIL_onRequestComplete(t, RIL_E_SUCCESS, &serviceClass, sizeof(serviceClass));
+    goto done;
+
+error:
+    RIL_onRequestComplete(t, cmeErrorToRilError(at_get_cme_error(p_response)), NULL, 0);
+
+done:
+    at_response_free(p_response);
+}
+
 /*** Callback methods from the RIL library to us ***/
 
 /**
@@ -3142,6 +3216,10 @@ onRequest (int request, void *data, size_t datalen, RIL_Token t)
             requestSetCallForward(data, datalen, t);
             break;
 
+        case RIL_REQUEST_QUERY_FACILITY_LOCK:
+            requestQueryFacilityLock(data, datalen, t);
+            break;
+
         default:
             if (TECH_BIT(sMdmInfo) & (MDM_CDMA | MDM_EVDO)) {
                 onCdmaSpecificRequest(request, data, datalen, t);