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

Commit f64ebe1d authored by Ameer Ghouse's avatar Ameer Ghouse Committed by Steve Kondik
Browse files

fix sms receiving for some Samsung CDMA phones 

cherry-picked from ICS branch, with addition of bool
to core/res/res/values/public.xml for jellybean

Change-Id: I4639b10e5d1c512135572807f9430e81b6b8869b
parent fc99f112

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -762,6 +762,9 @@ 
         If false, Content-disposition fragments are ignored -->

    <bool name="config_mms_content_disposition_support">true</bool>



    <!-- If this value is true, we handle Samsung CDMA's message ID method -->

    <bool name="config_smsSamsungCdmaAlternateMessageIDEncoding">false</bool>



    <!-- National Language Identifier codes for the following two config items.

         (from 3GPP TS 23.038 V9.1.1 Table 6.2.1.2.4.1):

          0  - reserved

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -3679,6 +3679,7 @@ 
  <java-symbol type="bool" name="config_hasRotationLockSwitch" />

  <java-symbol type="bool" name="config_hasDockBattery" />

  <java-symbol type="bool" name="config_noDelayInATwoDP" />

  <java-symbol type="bool" name="config_smsSamsungCdmaAlternateMessageIDEncoding" />



  <!-- Notification and battery light -->

  <java-symbol type="bool" name="config_intrusiveBatteryLed" />

telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java

+15 −4
Original line number Diff line number Diff line
@@ -935,11 +935,22 @@ public final class BearerData { 
            paramBits -= EXPECTED_PARAM_SIZE;

            decodeSuccess = true;

            bData.messageType = inStream.read(4);

            // Some Samsung CDMAphones parses messageId differently than other devices

            // fix it here so that incoming sms works correctly

            boolean hasSamsungCDMAAlternateMessageIDEncoding = Resources.getSystem()

                    .getBoolean(com.android.internal.R.bool.config_smsSamsungCdmaAlternateMessageIDEncoding);

            if (hasSamsungCDMAAlternateMessageIDEncoding) {

                inStream.skip(4);

                bData.messageId = inStream.read(8) << 8;

                bData.messageId |= inStream.read(8);

                bData.hasUserDataHeader = (inStream.read(8) == 1);

            } else {

                bData.messageId = inStream.read(8) << 8;

                bData.messageId |= inStream.read(8);

                bData.hasUserDataHeader = (inStream.read(1) == 1);

                inStream.skip(3);

            }

        }

        if ((! decodeSuccess) || (paramBits > 0)) {

            Log.d(LOG_TAG, "MESSAGE_IDENTIFIER decode " +

                      (decodeSuccess ? "succeeded" : "failed") +