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

Commit 9837423e authored by Stuart Scott's avatar Stuart Scott Committed by Android (Google) Code Review
Browse files

Merge "Ensure correct mapping when sim cards are ready." into mnc-dev

parents 6698f84f e50e6c1d

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

+14 −0
Original line number Diff line number Diff line
@@ -239,6 +239,20 @@ public class ProxyController { 
            }

        }



        // Check we actually need to do anything

        boolean same = true;

        for (int i = 0; i < mProxyPhones.length; i++) {

            if (mProxyPhones[i].getRadioAccessFamily() != rafs[i].getRadioAccessFamily()) {

                same = false;

            }

        }

        if (same) {

            // All phones are already set to the requested raf

            logd("setRadioCapability: Already in requested configuration, nothing to do.");

            // It isn't really an error, so return true - everything is OK.

            return true;

        }



        // Clear to be sure we're in the initial state

        clearTransaction();

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

+3 −0
Original line number Diff line number Diff line
@@ -550,6 +550,9 @@ public class SubscriptionInfoUpdater extends Handler { 
            }

        }



        // Ensure the modems are mapped correctly

        mSubscriptionManager.setDefaultDataSubId(mSubscriptionManager.getDefaultDataSubId());



        SubscriptionController.getInstance().notifySubscriptionInfoChanged();

        logd("updateSubscriptionInfoByIccId:- SsubscriptionInfo update complete");

    }