commit b380d7c867ca803156689c22e2012879bb0358e1
author Amit Mahajan <amitmahajan@google.com> Thu Jul 30 21:46:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 30 21:46:00 2020 +0000
tree c6dec4d07eed81aecb45c76ab9fd4aec9943d89a
parent 44ccdd3fbc849a6cd5bdfaba93be56223fa21f9c
parent e9d0552de8fe38e2480f9bc9fc9db5339eb9c9a5

Merge "Map the RAT included in ImsSmsMessage to RIL value correctly." am: d0412127b7 am: 16aff6bb6b am: bb7727bfa0 am: e9d0552de8

Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1378659

Change-Id: I62145abbef97c9b5db8e6e8e5b8a060c0063a563

libril/ril_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index e9bbc8b..06bdfef 100755
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -2221,11 +2221,9 @@
         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",