Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c29b73d3 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Fix failing to send SMS with SMSC over IMS" into rvc-dev am: 96e5d0c0... 

Merge "Fix failing to send SMS with SMSC over IMS" into rvc-dev am: 96e5d0c0 am: ac5913b1 am: 9b6c3f2f

Change-Id: I830c36d6ed35a3545af6bd081391341ae234891c
parents 2efefac0 9b6c3f2f

src/java/com/android/internal/telephony/ImsSmsDispatcher.java

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.ims.ImsManager; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.util.SMSDispatcherUtil;

import com.android.telephony.Rlog;
@@ -400,7 +401,7 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
                    token,

                    tracker.mMessageRef,

                    format,

                    smsc != null ? new String(smsc) : null,

                    smsc != null ? IccUtils.bytesToHexString(smsc) : null,

                    isRetry,

                    pdu);

            mMetrics.writeImsServiceSendSms(mPhone.getPhoneId(), format,