commit 204138d098e7a8ca6b0b237fccddf4c6f4fd0068
author Yan Yan <evitayan@google.com> Wed Sep 18 19:19:27 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 18 19:19:27 2024 +0000
tree 2e3ac0848af80af4396ab591a75e33ce5cd8fe79
parent d117465e3cd4efdc5e5f4502a68f3e5f80feb5a2
parent 49e9b4dd5e33bf4c8e8482dca7d7de69f97d0687

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

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

Change-Id: I1500b0c261f63ef635ca29e5951c019042ea2fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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