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

Commit 5f76b935 authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Add a key to provide the default capabilities for satellite service 

In case the entitlement server provides PLMN list and they are not in the list of carrier config, capabilities for those PLMNs will be empty.
Therefore it is needed to provide a way to set the default value for that scenario.
KEY_SATELLITE_DEFAULT_SERVICES_FOR_ENTITLEMENT_PLMNS_INT_ARRAY contains
values sms, mms and emergency is added.

Bug: 332811510
Test: Manually run below scenario and verified with the logs.
  1. conected to mock satellite service and run test entitlement server app
  2. override carrier config for newly added key
  3. turn on airplane mode and off
  4. verify whether entitlement provided plmns are updated with the default capabilitys.
  5. verify whether KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE provided PLMNs are not affectec by default capabilities.
Change-Id: I247121447c7356497233ba1ca230c5b8a9fe0f66
parent d4f04830

telephony/java/android/telephony/CarrierConfigManager.java

+20 −0
Original line number Diff line number Diff line
@@ -9873,6 +9873,21 @@ public class CarrierConfigManager { 
    public static final String KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING =

            "satellite_information_redirect_url_string";













    /**













     * An int array that contains default capabilities for carrier enabled satellite roaming.













     * If any PLMN is provided from the entitlement server, and it is not listed in













     * {@link #KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE}, default capabilities













     * will be used instead.













     * <p>













     * The default capabilities are













     * {@link NetworkRegistrationInfo#SERVICE_TYPE_SMS}, and













     * {@link NetworkRegistrationInfo#SERVICE_TYPE_MMS}













     *













     * @hide













     */













    public static final String KEY_CARRIER_ROAMING_SATELLITE_DEFAULT_SERVICES_INT_ARRAY =













            "carrier_roaming_satellite_default_services_int_array";



























    /**















     * Indicating whether DUN APN should be disabled when the device is roaming. In that case,















     * the default APN (i.e. internet) will be used for tethering.










@@ -10993,6 +11008,11 @@ public class CarrierConfigManager {













        sDefaults.putBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);















        sDefaults.putString(KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING, "androidSatmode");















        sDefaults.putString(KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING, "");













        sDefaults.putIntArray(KEY_CARRIER_ROAMING_SATELLITE_DEFAULT_SERVICES_INT_ARRAY,













                new int[] {













                        NetworkRegistrationInfo.SERVICE_TYPE_SMS,













                        NetworkRegistrationInfo.SERVICE_TYPE_MMS













                });















        sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);















        sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");















        sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);