summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2020-07-30 21:06:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-30 21:06:30 +0000
commitbb7727bfa06fecc39311c5975b162c8ccbb327b1 (patch)
treec6dec4d07eed81aecb45c76ab9fd4aec9943d89a
parentcb3ef0078bf005ad39ebf20f96dc585f4245b27a (diff)
parent16aff6bb6bd3388e208184212cd8117d9d449603 (diff)
downloadplatform_hardware_ril-bb7727bfa06fecc39311c5975b162c8ccbb327b1.tar.gz
platform_hardware_ril-bb7727bfa06fecc39311c5975b162c8ccbb327b1.tar.bz2
platform_hardware_ril-bb7727bfa06fecc39311c5975b162c8ccbb327b1.zip
Merge "Map the RAT included in ImsSmsMessage to RIL value correctly." am: d0412127b7 am: 16aff6bb6b
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1378659 Change-Id: Ie19fcdfc6d4bf67edd6fbb00ce6f39a605d78640
-rwxr-xr-xlibril/ril_service.cpp6
1 files changed, 2 insertions, 4 deletions
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",