commit b3b63b67aca8906bdb7d9bffbc5aa3450b961cd3
author Meng Wang <mewan@google.com> Thu Dec 19 12:28:55 2019 -0800
committer Meng Wang <mewan@google.com> Thu Dec 19 14:13:12 2019 -0800
tree 0758654e1051fb19d002e8566eab6ced8e669954
parent 1385dca8f6f8e582d867c817432447286df54e2e

Do not setSubId on SmsMessage.

subId is not used anywhere.

Bug: 140908357
Test: make
Change-Id: I8d1786a8aa5f47886d0127a8009b1312e6d3010e

core/java/android/provider/Telephony.java

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 7754666..df36f14 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -1352,7 +1352,6 @@
                 for (int i = 0; i < pduCount; i++) {
                     byte[] pdu = (byte[]) messages[i];
                     msgs[i] = SmsMessage.createFromPdu(pdu, format);
-                    if (msgs[i] != null) msgs[i].setSubId(subId);
                 }
                 return msgs;
             }