commit 49e9b4dd5e33bf4c8e8482dca7d7de69f97d0687
author Yan Yan <evitayan@google.com> Wed Sep 18 19:13:47 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 18 19:13:47 2024 +0000
tree 47b37d3eae95a0386de5fb7eb129082ac2ec58a0
parent 9c887e08a87aa92cac384468475eb8dabf77fccc
parent f17bb8e219f9945bf13ad7149af808670fbbfead

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

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

diff --git a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java
index 96a25da..1e82b89 100644
--- a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java
+++ b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java
@@ -322,9 +322,16 @@
 
         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);