commit 03307979292ee623f9180f6bc49e5f64a009b79a
author Meng Wang <mewan@google.com> Thu Dec 19 23:47:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 19 23:47:22 2019 +0000
tree e15e1d956fc29f3a44bbe37d1e4ace182b50ab18
parent 670352e807f37c3123b9f2f41b8ae96911d906c5
parent b3b63b67aca8906bdb7d9bffbc5aa3450b961cd3

Merge "Do not setSubId on SmsMessage."

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;
             }