diff options
| author | SongFerng Wang <songferngwang@google.com> | 2021-03-22 19:06:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-22 19:06:48 +0000 |
| commit | b24ba9d52fb81d4343d0b93c7d2c9ec7f239dbd1 (patch) | |
| tree | c3b7f4b156ff8c767c8e15c652a7edfb23abe069 /core | |
| parent | 003db3a53e788a35805a63eb233cb700363d88ab (diff) | |
| parent | 98edbb0bbce92f935170213a4f4f214fc208420a (diff) | |
Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray"
Diffstat (limited to 'core')
| -rw-r--r-- | core/api/current.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index b8a99167c17b..07bebbeb7859 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -39096,7 +39096,6 @@ package android.telephony { method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle); method public void notifyConfigChangedForSubId(int); field public static final String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; - field public static final int CARRIER_NR_AVAILABILITY_NONE = 0; // 0x0 field public static final int CARRIER_NR_AVAILABILITY_NSA = 1; // 0x1 field public static final int CARRIER_NR_AVAILABILITY_SA = 2; // 0x2 field public static final int DATA_CYCLE_THRESHOLD_DISABLED = -2; // 0xfffffffe @@ -39157,7 +39156,7 @@ package android.telephony { field public static final String KEY_CARRIER_INSTANT_LETTERING_LENGTH_LIMIT_INT = "carrier_instant_lettering_length_limit_int"; field public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool"; field public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string"; - field public static final String KEY_CARRIER_NR_AVAILABILITY_INT = "carrier_nr_availability_int"; + field public static final String KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY = "carrier_nr_availabilities_int_array"; field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool"; 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"; |