[GP-654] Add SIM card-based carrier detection

Changes after a code review:

- renamed "MTS Carrier Code" to the "Carrier Code";
- fixed descriptions for the new field and methods.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/MTS_IO_CellularRadio.cpp b/src/MTS_IO_CellularRadio.cpp
index bef15e9..b18478e 100644
--- a/src/MTS_IO_CellularRadio.cpp
+++ b/src/MTS_IO_CellularRadio.cpp
@@ -912,11 +912,11 @@ ICellularRadio::CODE CellularRadio::unlockSimCard(const Json::Value& jArgs) {
     return SUCCESS;
 }
 
-ICellularRadio::CODE CellularRadio::getMtsSimCarrierCode(std::string& sCarrierCode) {
+ICellularRadio::CODE CellularRadio::getSimCarrierCode(std::string& sCarrierCode) {
     std::string sIccid;
     CODE rc;
 
-    printTrace("%s| Get MTS carrier code from the SIM card installed", m_sName.c_str());
+    printTrace("%s| Get carrier code from the SIM card installed", m_sName.c_str());
 
     rc = getIccid(sIccid);
     if (rc != SUCCESS) {
@@ -926,26 +926,26 @@ ICellularRadio::CODE CellularRadio::getMtsSimCarrierCode(std::string& sCarrierCo
 
     printTrace("%s| Fetched ICCID: [%s]", m_sName.c_str(), sIccid.c_str());
 
-    rc = getMtsSimCarrierCode(sIccid, sCarrierCode);
+    rc = getSimCarrierCode(sIccid, sCarrierCode);
     if (rc != SUCCESS) {
         printError("%s| Unable to determine SIM carrier: Unable to extract carrier from the SIM identifier", m_sName.c_str());
         return rc;
     }
 
-    printTrace("%s| Detected MTS carrier code: [%s]", m_sName.c_str(), sCarrierCode.c_str());
+    printTrace("%s| Detected carrier code: [%s]", m_sName.c_str(), sCarrierCode.c_str());
     return rc;
 }
 
-ICellularRadio::CODE CellularRadio::getMtsSimCarrierCode(const std::string& sIccid, std::string& sCarrierCode) {
+ICellularRadio::CODE CellularRadio::getSimCarrierCode(const std::string& sIccid, std::string& sCarrierCode) {
     const char* ICCID_PREFIX_VZW = "891480";
     const char* ICCID_PREFIX_ATT = "8901410";
 
     if (sIccid.find(ICCID_PREFIX_VZW) == 0) {
         printTrace("%s| Verizon SIM detected", m_sName.c_str());
-        sCarrierCode = VALUE_MTS_CARRIER_CODE_VERIZON;
+        sCarrierCode = VALUE_CARRIER_CODE_VERIZON;
     } else if (sIccid.find(ICCID_PREFIX_ATT) == 0) {
         printTrace("%s| AT&T SIM detected", m_sName.c_str());
-        sCarrierCode = VALUE_MTS_CARRIER_CODE_ATT;
+        sCarrierCode = VALUE_CARRIER_CODE_ATT;
     } else {
         // All other carriers for which ICCID prefixes are not defined
         printWarning("%s| Carrier is unknown for this SIM ID: [%s]", m_sName.c_str(), sIccid.c_str());