Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add CarrierConfig key to provide service numbers via CarrierConfig."

Browse Source
This commit is contained in:
Gyanesh Mittal
2023-03-28 17:50:56 +00:00
committed by Gerrit Code Review
parent 9d6d0e2db3 3dea7afacf
commit 2fef8f6e9d
2 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -41362,6 +41362,8 @@ package android.telephony {
field public static final String KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY = "carrier_nr_availabilities_int_array";
field public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL = "carrier_provisions_wifi_merged_networks_bool";
field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";
field public static final String KEY_CARRIER_SERVICE_NAME_STRING_ARRAY = "carrier_service_name_array";
field public static final String KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY = "carrier_service_number_array";
field public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING = "carrier_settings_activity_component_name_string";
field public static final String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";
field public static final String KEY_CARRIER_SUPPORTS_OPP_DATA_AUTO_PROVISIONING_BOOL = "carrier_supports_opp_data_auto_provisioning_bool";

53
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -4477,6 +4477,57 @@ public class CarrierConfigManager {
public static final String KEY_DATA_STALL_RECOVERY_SHOULD_SKIP_BOOL_ARRAY =
"data_stall_recovery_should_skip_bool_array";
/**
* String array containing the list of names for service numbers provided by carriers. This key
* should be used with {@link #KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY}. The names provided in
* this array will be mapped 1:1 with the numbers provided in the {@link
* #KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY} array.
*
* <p>The data would be considered valid if and only if:
*
* <ul>
* <li>The number of items in both the arrays are equal
* <li>The data added to the {@link #KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY} array is valid.
* See {@link #KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY} for more information.
* </ul>
*
* <p>Example:
*
* <pre><code>
* <string-array name="carrier_service_name_array" num="2">
* <item value="Police"/>
* <item value="Ambulance"/>
* </string-array>
* </code></pre>
*/
public static final String KEY_CARRIER_SERVICE_NAME_STRING_ARRAY = "carrier_service_name_array";
/**
* String array containing the list of service numbers provided by carriers. This key should be
* used with {@link #KEY_CARRIER_SERVICE_NAME_STRING_ARRAY}. The numbers provided in this array
* will be mapped 1:1 with the names provided in the {@link
* #KEY_CARRIER_SERVICE_NAME_STRING_ARRAY} array.
*
* <p>The data would be considered valid if and only if:
*
* <ul>
* <li>The number of items in both the arrays are equal
* <li>The item added in this key follows a specific format. Either it should be all numbers,
* or "+" followed by all numbers.
* </ul>
*
* <p>Example:
*
* <pre><code>
* <string-array name="carrier_service_number_array" num="2">
* <item value="123"/>
* <item value="+343"/>
* </string-array>
* </code></pre>
*/
public static final String KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY =
"carrier_service_number_array";
/**
* Configs used by ImsServiceEntitlement.
*/
@@ -9350,6 +9401,8 @@ public class CarrierConfigManager {
new long[] {180000, 180000, 180000, 180000});
sDefaults.putBooleanArray(KEY_DATA_STALL_RECOVERY_SHOULD_SKIP_BOOL_ARRAY,
new boolean[] {false, false, true, false, false});
sDefaults.putStringArray(KEY_CARRIER_SERVICE_NAME_STRING_ARRAY, new String[0]);
sDefaults.putStringArray(KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY, new String[0]);
}
/**