Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83b30802 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show subId info for getMessagesFromIntent log if it available only" am: 64785597 

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

Change-Id: I57410539f4d4e449e47bf8dade55de823bff3bc4
parents 1e085a1d 64785597

core/java/android/provider/Telephony.java

+7 −5
Original line number Diff line number Diff line
@@ -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];