diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-16 00:49:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-16 00:49:12 +0000 |
| commit | 647855972114e8eddfb5261f9de64ebad0abcae0 (patch) | |
| tree | 33be5f9f76afe85931670fa548f69c30dafc12ac /core/java/android | |
| parent | 06b1ba180d1f0ae2ee66516ca782f65934fb0950 (diff) | |
| parent | 7e26fe7ce360c45a43398bc3a6057d529b579bfd (diff) | |
Merge "Show subId info for getMessagesFromIntent log if it available only"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Telephony.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index a95fe3c4043d..7946dda3170d 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]; |