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

Commit 325ae99b authored by Stuart Scott's avatar Stuart Scott Committed by Robert Greenwalt
Browse files

Only reassign modems if default data sub is valid. 

bug:20255880
Change-Id: I20912d5203613fddd9d7c28708d97f8d10ee8abd
parent a5ea9112

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

+17 −14
Original line number Diff line number Diff line
@@ -1412,6 +1412,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];
@@ -1428,6 +1430,7 @@ public class SubscriptionController extends ISub.Stub { 
                rafs[phoneId] = new RadioAccessFamily(phoneId, raf);

            }

            proxyController.setRadioCapability(rafs);

        }



        // FIXME is this still needed?

        updateAllDataConnectionTrackers();