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

Commit f17bb8e2 authored by Yan Yan's avatar Yan Yan
Browse files

VCN: Replace hidden API getCarrierConfigSubset(Context, int, String)

This is a preparation CL for moving VCN to a mainline module

Bug: 288465472
Test: atest FrameworksVcnTest && atest CtsVcnTestCases
Flag: EXEMPT pure refactoring
Change-Id: I44470a231cdcf4c0a35c54aba5b1967a0bdb2dd7
parent f54eb9cb
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
@@ -322,9 +322,16 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {

        if (SubscriptionManager.isValidSubscriptionId(subId)) {
            // Get only configs as needed to save memory.
            final PersistableBundle carrierConfig =
                    CarrierConfigManager.getCarrierConfigSubset(mContext, subId,
                            VcnManager.VCN_RELATED_CARRIER_CONFIG_KEYS);
            PersistableBundle carrierConfig = new PersistableBundle();
            try {
                carrierConfig =
                        mCarrierConfigManager.getConfigForSubId(
                                subId, VcnManager.VCN_RELATED_CARRIER_CONFIG_KEYS);

            } catch (RuntimeException exception) {
                Slog.w(TAG, "CarrierConfigLoader is not available.");
            }

            if (mDeps.isConfigForIdentifiedCarrier(carrierConfig)) {
                mReadySubIdsBySlotId.put(slotId, subId);