Snap for 6877830 from 850741d2cbbf8c2b921fd3d57079a145dd0607f1 to sdk-release

Change-Id: I3da2a7bfa13e10dc7981d72fc4d2f78fb1767057

3 files changed, 5 insertions, 7 deletions

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 75301466..c879873d 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -743,8 +743,8 @@ typedef struct {
 typedef struct {
   int32_t len_allowed_carriers;         /* length of array allowed_carriers */
   int32_t len_excluded_carriers;        /* length of array excluded_carriers */
-  RIL_Carrier * allowed_carriers;       /* whitelist for allowed carriers */
-  RIL_Carrier * excluded_carriers;      /* blacklist for explicitly excluded carriers
+  RIL_Carrier * allowed_carriers;       /* list of allowed carriers */
+  RIL_Carrier * excluded_carriers;      /* list of explicitly excluded carriers
                                          * which match allowed_carriers. Eg. allowed_carriers match
                                          * mcc/mnc, excluded_carriers has same mcc/mnc and gid1
                                          * is ABCD. It means except the carrier whose gid1 is ABCD,
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index e9bbc8b6..06bdfef5 100755
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -2221,11 +2221,9 @@ Return<void> RadioImpl::sendImsSms(int32_t serial, const ImsSmsMessage& message)
         return Void();
     }
 
-    RIL_RadioTechnologyFamily format = (RIL_RadioTechnologyFamily) message.tech;
-
-    if (RADIO_TECH_3GPP == format) {
+    if (RadioTechnologyFamily::THREE_GPP == message.tech) {
         dispatchImsGsmSms(message, pRI);
-    } else if (RADIO_TECH_3GPP2 == format) {
+    } else if (RadioTechnologyFamily::THREE_GPP2 == message.tech) {
         dispatchImsCdmaSms(message, pRI);
     } else {
         RLOGE("sendImsSms: Invalid radio tech %s",
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index 084c4add..430bc9b6 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -1838,7 +1838,7 @@ static void requestSimOpenChannel(void *data, size_t datalen, RIL_Token t)
         return;
     }
 
-    snprintf(cmd, sizeof(cmd), "AT+CCHO=%s", data);
+    snprintf(cmd, sizeof(cmd), "AT+CCHO=%s", (char*) data);
 
     err = at_send_command_numeric(cmd, &p_response);
     if (err < 0 || p_response == NULL || p_response->success == 0) {