commit f18b86a5c5b1f087451f10afeffd6133eef457dd
author Sarah Chin <sarahchin@google.com> Fri Feb 21 02:54:25 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 21 02:54:25 2020 +0000
tree 2889f17e723b4a27f6e9f26bcea397e6c7b7f0d7
parent e9501ca4f502b9636cd5d5714453b3fd2e92786b
parent b531c61b4d6f6f10da1c51df3ef86d4bcd4f2ca9

Merge "Uncomment logic for RAT change and add NR State/Frequency"

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

diff --git a/src/java/com/android/internal/telephony/CommandsInterface.java b/src/java/com/android/internal/telephony/CommandsInterface.java
index cf6c38c..7a05fa1 100644
--- a/src/java/com/android/internal/telephony/CommandsInterface.java
+++ b/src/java/com/android/internal/telephony/CommandsInterface.java
@@ -1184,6 +1184,11 @@
      */
     void sendCdmaSms(byte[] pdu, Message response);
 
+    /**
+     * Identical to sendCdmaSms, except that more messages are expected to be sent soon
+     * @param pdu is CDMA-SMS in internal pseudo-PDU format
+     * @param response response sent when operation completed
+     */
     void sendCdmaSMSExpectMore(byte[] pdu, Message response);
 
     /**

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

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index b812432..9de0fe2 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -3213,7 +3213,7 @@
                     (android.hardware.radio.V1_5.IRadio) radioProxy;
             if (radioProxy15 != null) {
                 RILRequest rr = obtainRequest(RIL_REQUEST_CDMA_SEND_SMS_EXPECT_MORE, result,
-                    mRILDefaultWorkSource);
+                        mRILDefaultWorkSource);
 
                 // Do not log function arg for privacy
                 if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
@@ -3224,7 +3224,7 @@
                 try {
                     radioProxy15.sendCdmaSmsExpectMore(rr.mSerial, msg);
                     mMetrics.writeRilSendSms(mPhoneId, rr.mSerial, SmsSession.Event.Tech.SMS_CDMA,
-                        SmsSession.Event.Format.SMS_FORMAT_3GPP2);
+                            SmsSession.Event.Format.SMS_FORMAT_3GPP2);
                 } catch (RemoteException | RuntimeException e) {
                     handleRadioProxyExceptionForRR(rr, "sendCdmaSMSExpectMore", e);
                 }

src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
index 3e60612..4877baf 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
@@ -163,7 +163,7 @@
         //   that the message should fall back to sending over CS.
         if (0 == tracker.mImsRetry && !isIms() || imsSmsDisabled || tracker.mUsesImsServiceForIms) {
             if (tracker.mRetryCount == 0 && tracker.mExpectMore) {
-                mCi.sendCdmaSMSExpectMore(pdu,reply);
+                mCi.sendCdmaSMSExpectMore(pdu, reply);
             } else {
                 mCi.sendCdmaSms(pdu, reply);
             }