Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show subId info for getMessagesFromIntent log if it available only" am: 6478559721 am: 83b308025a am: 40b66a14d8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318274

Change-Id: I5a4a4454d4e0ee958e3b2fdab0e456f942ec5b6b
This commit is contained in:
Treehugger Robot
2020-07-16 01:33:36 +00:00
committed by Automerger Merge Worker
parent 803e7fa1d8 40b66a14d8
commit d2d9f54da1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/provider/Telephony.java
View File

@@ -1357,8 +1357,7 @@ public final class Telephony {
Object[] messages; Object[] messages;
try { try {
messages = (Object[]) intent.getSerializableExtra("pdus"); messages = (Object[]) intent.getSerializableExtra("pdus");
} } catch (ClassCastException e) {
catch (ClassCastException e) {
Rlog.e(TAG, "getMessagesFromIntent: " + e); Rlog.e(TAG, "getMessagesFromIntent: " + e);
return null; return null;
} }
@@ -1370,9 +1369,12 @@ public final class Telephony {
String format = intent.getStringExtra("format"); String format = intent.getStringExtra("format");
int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
SubscriptionManager.getDefaultSmsSubscriptionId()); SubscriptionManager.INVALID_SUBSCRIPTION_ID);
if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
Rlog.v(TAG, " getMessagesFromIntent sub_id : " + subId); Rlog.v(TAG, "getMessagesFromIntent with valid subId : " + subId);
} else {
Rlog.v(TAG, "getMessagesFromIntent");
}
int pduCount = messages.length; int pduCount = messages.length;
SmsMessage[] msgs = new SmsMessage[pduCount]; SmsMessage[] msgs = new SmsMessage[pduCount];