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

Commit 20eb053e authored by rambowang's avatar rambowang
Browse files

Make sure all data network carrier configs have default value 

This cl sets the default value (all empty string) for the following
carrier configs which didn't set default value:
- KEY_CARRIER_DATA_SERVICE_WWAN_CLASS_OVERRIDE_STRING
- KEY_CARRIER_DATA_SERVICE_WLAN_CLASS_OVERRIDE_STRING
- KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING
- KEY_CARRIER_NETWORK_SERVICE_WLAN_CLASS_OVERRIDE_STRING
- KEY_CARRIER_NETWORK_SERVICE_WWAN_CLASS_OVERRIDE_STRING,
- KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING

Without default value, the configs will not be returned from APIs
like CarrierConigManager.getConfigForSub if default and carrier
config app doesn't override them. It may cause caller
process crash if not handled properly.

Bug: 261776046
Test: atest FrameworksTelephonyTests
Test: Basic phone functional test (activation/call/data/messages...)
Change-Id: I633799e266df2a692bf6b90f6d1e0499477bdaf3
parent 2c89ce00

telephony/java/android/telephony/CarrierConfigManager.java

+6 −0
Original line number Diff line number Diff line
@@ -9881,9 +9881,15 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_USE_ONLY_DIALED_SIM_ECC_LIST_BOOL, false);

        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_CLASS_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_CLASS_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WWAN_CLASS_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WLAN_CLASS_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");

        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING, "");

        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ENCODING_STRING, "");