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

Commit c443b334 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "MSIM: Do not initiate flex map if RAF/modemUuid are invalid"

parents aff3bf64 840e64cb
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -255,6 +255,20 @@ public class ProxyController {
            return true;
        }

        // Proceed with flex map only if both phones have valid RAF/modemUuid values.
        // Sometimes due to phone object switch existing phone RAF values disposed which can
        // cause both phoens to link same modemUuid.
        for (int i = 0; i < mProxyPhones.length; i++) {
            int raf = mProxyPhones[i].getRadioAccessFamily();
            String modemUuid = mProxyPhones[i].getModemUuId();
            if ((raf == RadioAccessFamily.RAF_UNKNOWN) ||
                     (modemUuid == null) || (modemUuid.length() == 0)) {
                logd("setRadioCapability: invalid RAF = " + raf + " or modemUuid = " +
                         modemUuid + " for phone = " + i);
                return false;
            }
        }

        // Clear to be sure we're in the initial state
        clearTransaction();

+1 −1
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ public class SubscriptionController extends ISub.Stub {
    public void setDefaultDataSubId(int subId) {
        enforceModifyPhoneState("setDefaultDataSubId");
        String flexMapSupportType =
                SystemProperties.get("persist.radio.flexmap", "nw_mode");
                SystemProperties.get("persist.radio.flexmap_type", "nw_mode");

        if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
            throw new RuntimeException("setDefaultDataSubId called with DEFAULT_SUB_ID");