diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-16 01:18:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 01:18:14 +0000 |
| commit | 40b66a14d8012a2a8911e2e15c56c29b36014dca (patch) | |
| tree | dde91967b35c19943b73f0a1abd10f6a8fdd3c16 /core/java/android | |
| parent | 34d15e35a4a9857d3e4a6067568d3b957d0ba6f3 (diff) | |
| parent | 83b308025a0f818a6178f7957b0e75f291cd5b83 (diff) | |
Merge "Show subId info for getMessagesFromIntent log if it available only" am: 6478559721 am: 83b308025a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318274
Change-Id: I07a163cbfaf5e76f94d758953fed8d48c6cc66d8
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 a2489b9b68d9..784119f94679 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1357,8 +1357,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; } @@ -1370,9 +1369,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]; |