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

Commit 49e9b4dd authored by Yan Yan's avatar Yan Yan Committed by Gerrit Code Review
Browse files

Merge "VCN: Replace hidden API getCarrierConfigSubset(Context, int, String)" into main

parents 9c887e08 f17bb8e2

services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java

+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);