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

Commit 1554a171 authored by Adnan Begovic's avatar Adnan Begovic
Browse files

Telephony: Fall back on deprecated createFromPdu. 

 Since some of our legacy cdma devices utilizes legacy
 RIL blobs and hacky implementations, we can't wholly rely
 on getting a correct format from the InboundSmsTracker.

 Thus we fallback on the deprecated createFromPdu which attempts
 to guess the format of the SmsMessage by looking at the voice tech
 and falling back to the other format if it's incorrect.

Change-Id: I90dc185071de827510f2bcec1c837c0024182c41
parent add0f99c

src/java/android/provider/Telephony.java

+12 −0
Original line number Diff line number Diff line
@@ -1164,6 +1164,18 @@ public final class Telephony { 
                for (int i = 0; i < pduCount; i++) {

                    byte[] pdu = (byte[]) pdus[i];

                    msgs[i] = SmsMessage.createFromPdu(pdu, format);

                    // If the originating address is null on our message

                    // then the format for SmsMessage createFromPdu is likely

                    // incorrect. SmsMessage createFromPdu(the new method)

                    // takes in a format parameter that it gets from the Tracker

                    // however, on some of our legacy devices using a legacy ril,

                    // since that format is derived by getting voice tech,

                    // we can get a bad format and no valid members.

                    // Thus we introduce a hack that utilizes the deprecated

                    // SmsMessage.createFromPdu if we get a null originating address.

                    if (msgs[i].getOriginatingAddress() == null) {

                        msgs[i] = SmsMessage.createFromPdu(pdu);

                    }

                    String originatingAddress = msgs[i].getOriginatingAddress();

                    if (!TextUtils.isEmpty(originatingAddress)) {

                        String normalized = normalizeDigitsOnly(originatingAddress);