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

Commit 22b14a5e authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan
Browse files

telephony: disable the use of SMS_EXPECT_MORE by default (2/2) 

CodeAurora added the use of the RIL_REQUEST_SEND_SMS_EXPECT_MORE API
which is not supported by every RIL. Disabled it by default to reflect
AOSP behavior and added a flag to enable it.

Change-Id: I837c161bbca3960e7458ea049f896218d5e60a63
parent e8d3dd90

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

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ public abstract class SMSDispatcher extends Handler { 
    protected boolean mSmsCapable = true;

    protected boolean mSmsSendDisabled;

    private   boolean mSmsPseudoMultipart;

    protected boolean mSmsUseExpectMore;



    protected int mRemainingMessages = -1;
@@ -195,6 +196,8 @@ public abstract class SMSDispatcher extends Handler { 
        mSmsSendDisabled = !SystemProperties.getBoolean(

                                TelephonyProperties.PROPERTY_SMS_SEND, mSmsCapable);

        mSmsPseudoMultipart = SystemProperties.getBoolean("telephony.sms.pseudo_multipart", false);

        mSmsUseExpectMore = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_smsUseExpectMore);

        Rlog.d(TAG, "SMSDispatcher: ctor mSmsCapable=" + mSmsCapable + " format=" + getFormat()

                + " mSmsSendDisabled=" + mSmsSendDisabled);

    }

src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ public class GsmSMSDispatcher extends SMSDispatcher { 
                    pdu[1] = (byte) tracker.mMessageRef; // TP-MR

                }

            }

            if (tracker.mRetryCount == 0 && tracker.mExpectMore) {

            if (tracker.mRetryCount == 0 && tracker.mExpectMore && mSmsUseExpectMore) {

                mCi.sendSMSExpectMore(IccUtils.bytesToHexString(smsc),

                        IccUtils.bytesToHexString(pdu), reply);

            } else {