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

Commit 028f2c87 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Allow radio info on phones with no subscription" am: 19d1f890 am: b377a593 

am: 1fc63fc4

Change-Id: I114db364c10315dca50b75270fc14da7eaf1d354
parents c586c923 1fc63fc4

src/com/android/settings/RadioInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -1621,14 +1621,14 @@ public class RadioInfo extends Activity { 
                }

                log("switching to phone " + phoneIndex);

                // getSubId says it takes a slotIndex, but it actually takes a phone index

                int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

                int[] subIds = SubscriptionManager.getSubId(phoneIndex);

                if (subIds == null || subIds.length < 1) {

                    log("no subscription found for phoneIndex " + phoneIndex);

                    return;

                if (subIds != null && subIds.length > 0) {

                    subId = subIds[0];

                }

                mSelectedPhoneIndex = phoneIndex;



                updatePhoneIndex(phoneIndex, subIds[0]);

                updatePhoneIndex(phoneIndex, subId);

            }

        }