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

Commit 1902cd5b authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

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

Merge "VCN: Replace hidden API getCarrierConfigSubset(Context, int, String)" into main am: 49e9b4dd am: 204138d0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3270471



Change-Id: I8de2dbc487f98d3d413211b2847b96a732b668a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe1a2773 204138d0

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