diff options
| author | 2024-09-18 19:20:16 +0000 | |
|---|---|---|
| committer | 2024-09-18 19:20:16 +0000 | |
| commit | 1902cd5b15d1000668747b1dad45e3baaa68a527 (patch) | |
| tree | ac6093b19951f8c01939be616513e9392d759f5a | |
| parent | fe1a2773790148fa770103a8e1eb3d09a3929c26 (diff) | |
| parent | 204138d098e7a8ca6b0b237fccddf4c6f4fd0068 (diff) | |
Merge "VCN: Replace hidden API getCarrierConfigSubset(Context, int, String)" into main am: 49e9b4dd5e am: 204138d098
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3270471
Change-Id: I8de2dbc487f98d3d413211b2847b96a732b668a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java index 96a25dac21e3..1e82b8999834 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 @@ 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); |