From 7e26fe7ce360c45a43398bc3a6057d529b579bfd Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Wed, 27 May 2020 12:48:57 +0900 Subject: [PATCH] Show subId info for getMessagesFromIntent log if it available only getMessagesFromIntent with default SMS subId log is shown from AppSmsManager for MT SMS always since an intent without subId info is delivered to AppSmsManager first. It might be confusing when checking MT SMS log for multi-sim devices. Bug: 161156506 Test: MT SMS and Check log Signed-off-by: Taesu Lee Change-Id: I66da0d5d9802c4427572cb1674be452582066450 --- core/java/android/provider/Telephony.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index a95fe3c4043d6..7946dda3170d8 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1331,8 +1331,7 @@ public final class Telephony { Object[] messages; try { messages = (Object[]) intent.getSerializableExtra("pdus"); - } - catch (ClassCastException e) { + } catch (ClassCastException e) { Rlog.e(TAG, "getMessagesFromIntent: " + e); return null; } @@ -1344,9 +1343,12 @@ public final class Telephony { String format = intent.getStringExtra("format"); int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, - SubscriptionManager.getDefaultSmsSubscriptionId()); - - Rlog.v(TAG, " getMessagesFromIntent sub_id : " + subId); + SubscriptionManager.INVALID_SUBSCRIPTION_ID); + if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + Rlog.v(TAG, "getMessagesFromIntent with valid subId : " + subId); + } else { + Rlog.v(TAG, "getMessagesFromIntent"); + } int pduCount = messages.length; SmsMessage[] msgs = new SmsMessage[pduCount];