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

Commit fadff04b authored by Adnan's avatar Adnan
Browse files

Check for null on originating address in an SMSMessage.

  - Don't attempt to normalized an address if the originating
  address isn't given to us.

  - BUGDUMP-251344

Change-Id: I78c47f7c82886c1b6386f50d238850b51e1fc69d
parent c20544f1
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -1164,9 +1164,12 @@ public final class Telephony {
                for (int i = 0; i < pduCount; i++) {
                    byte[] pdu = (byte[]) pdus[i];
                    msgs[i] = SmsMessage.createFromPdu(pdu, format);
                    String normalized = normalizeDigitsOnly(msgs[i].getOriginatingAddress());
                    String originatingAddress = msgs[i].getOriginatingAddress();
                    if (!TextUtils.isEmpty(originatingAddress)) {
                        String normalized = normalizeDigitsOnly(originatingAddress);
                        addresses.add(normalized);
                    }
                }
                return addresses;
            }