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

Commit 651c3774 authored by Stuart Scott's avatar Stuart Scott Committed by Robert Greenwalt
Browse files

DO NOT MERGE - Only reassign modems if the default data subscription is valid. 

bug:20255880
Change-Id: I7dcff9b896cc8a67543a3a0f92998e020c3b39c0
parent 71873c36

src/java/com/android/internal/telephony/SubscriptionController.java

+17 −14
Original line number Diff line number Diff line
@@ -1252,6 +1252,8 @@ public class SubscriptionController extends ISub.Stub { 
        int len = sProxyPhones.length;

        logdl("[setDefaultDataSubId] num phones=" + len);



        if (SubscriptionManager.isValidSubscriptionId(subId)) {

            // Only re-map modems if the new default data sub is valid

            RadioAccessFamily[] rafs = new RadioAccessFamily[len];

            for (int phoneId = 0; phoneId < len; phoneId++) {

                PhoneProxy phone = sProxyPhones[phoneId];
@@ -1268,6 +1270,7 @@ public class SubscriptionController extends ISub.Stub { 
                rafs[phoneId] = new RadioAccessFamily(phoneId, raf);

            }

            proxyController.setRadioCapability(rafs);

        }



        // FIXME is this still needed?

        updateAllDataConnectionTrackers();