Update telephony lib components to remove dupplication

CarrierConfigManager.getCarrierConfigSubset is introduced to remove
the repetitive private methods in system components.

Bug: 263267340
Test: FrameworksTelephonyTests
Change-Id: Iddde4ef4c5736c02065b8c749a674a95555f5ec8

2 files changed, 11 insertions, 24 deletions

diff --git a/src/java/com/android/internal/telephony/uicc/PinStorage.java b/src/java/com/android/internal/telephony/uicc/PinStorage.java
index acec14e83d..18bf666847 100644
--- a/src/java/com/android/internal/telephony/uicc/PinStorage.java
+++ b/src/java/com/android/internal/telephony/uicc/PinStorage.java
@@ -991,15 +991,13 @@ public class PinStorage extends Handler {
         PersistableBundle config = null;
         CarrierConfigManager configManager =
                 mContext.getSystemService(CarrierConfigManager.class);
-        if (configManager != null) {
-            Phone phone = PhoneFactory.getPhone(slotId);
-            try {
-                // If an invalid subId is used, this bundle will contain default values.
-                config = configManager.getConfigForSubId(phone.getSubId(),
-                        CarrierConfigManager.KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL);
-            } catch (RuntimeException e) {
-                loge("Can't get carrier config subset.");
-            }
+        Phone phone = PhoneFactory.getPhone(slotId);
+        if (configManager != null && phone != null) {
+            config =
+                    CarrierConfigManager.getCarrierConfigSubset(
+                            mContext,
+                            phone.getSubId(),
+                            CarrierConfigManager.KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL);
         }
         if (config == null || config.isEmpty()) {
             config = CarrierConfigManager.getDefaultConfig();
diff --git a/src/java/com/android/internal/telephony/uicc/UiccProfile.java b/src/java/com/android/internal/telephony/uicc/UiccProfile.java
index 1d8615b0ee..c27fff16e3 100644
--- a/src/java/com/android/internal/telephony/uicc/UiccProfile.java
+++ b/src/java/com/android/internal/telephony/uicc/UiccProfile.java
@@ -20,7 +20,6 @@ import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT
 import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_VERIFICATION_FAILURE;
 import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_VERIFICATION_SUCCESS;
 
-import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.app.ActivityManager;
 import android.app.usage.UsageStatsManager;
@@ -462,7 +461,8 @@ public class UiccProfile extends IccCard {
         }
 
         PersistableBundle config =
-                getCarrierConfigSubset(
+                CarrierConfigManager.getCarrierConfigSubset(
+                        mContext,
                         subId,
                         CarrierConfigManager.KEY_CARRIER_NAME_OVERRIDE_BOOL,
                         CarrierConfigManager.KEY_CARRIER_NAME_STRING);
@@ -534,8 +534,8 @@ public class UiccProfile extends IccCard {
         }
 
         PersistableBundle config =
-                getCarrierConfigSubset(
-                        subId, CarrierConfigManager.KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING);
+                CarrierConfigManager.getCarrierConfigSubset(
+                        mContext, subId, CarrierConfigManager.KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING);
         if (config.isEmpty()) {
             loge("handleSimCountryIsoOverride: fail to get carrier configs.");
             return;
@@ -1817,17 +1817,6 @@ public class UiccProfile extends IccCard {
         return null;
     }
 
-    @NonNull
-    private PersistableBundle getCarrierConfigSubset(int subId, String... keys) {
-        PersistableBundle bundle = null;
-        try {
-            bundle = mCarrierConfigManager.getConfigForSubId(subId, keys);
-        } catch (RuntimeException e) {
-            loge("CarrierConfigLoader is not available.");
-        }
-        return bundle != null ? bundle : new PersistableBundle();
-    }
-
     private static String eventToString(int event) {
         switch (event) {
             case EVENT_RADIO_OFF_OR_UNAVAILABLE: return "RADIO_OFF_OR_UNAVAILABLE";