diff options
| author | 2021-03-10 22:33:14 +0000 | |
|---|---|---|
| committer | 2021-03-10 22:33:14 +0000 | |
| commit | 897f0e2b4263b1164500c3897c8283f3f87b479d (patch) | |
| tree | 635099111b4cbbc1050494eb1171f7f9bc86d5e1 | |
| parent | 364576c7e00c74f83c9d0b943ed1ca434627f562 (diff) | |
| parent | 127659140c2612c7435255f3019c1c854b5a5965 (diff) | |
Merge "Fix documentation error in cross sim config" into sc-dev
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b52f49190679..763c968ef50b 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -35,7 +35,6 @@ import android.telecom.TelecomManager; import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.ImsRegistrationAttributes; import android.telephony.ims.ImsSsData; -import android.telephony.ims.SipDelegateManager; import android.telephony.ims.feature.MmTelFeature; import android.telephony.ims.feature.RcsFeature; @@ -1537,15 +1536,13 @@ public class CarrierConfigManager { "wfc_carrier_name_override_by_pnn_bool"; /** - * Value for {#CROSS_SIM_SPN_FORMAT_CARRIER_NAME_WITH_BRANDING} cnfig. - * specifies SPN format of displaying carrier name only. + * Specifies SPN format of displaying carrier name only. * */ public static final int CROSS_SIM_SPN_FORMAT_CARRIER_NAME_ONLY = 0; /** - * Value for {#CROSS_SIM_SPN_FORMAT_CARRIER_NAME_WITH_BRANDING} cnfig. - * specifies SPN format of displaying carrier name along with "Cross-SIM calling". + * Specifies SPN format of displaying carrier name along with "Cross-SIM calling". */ public static final int CROSS_SIM_SPN_FORMAT_CARRIER_NAME_WITH_BRANDING = 1; @@ -1554,8 +1551,8 @@ public class CarrierConfigManager { * * <p>Available options are: * <ul> - * <li> {#CROSS_SIM_SPN_FORMAT_CARRIER_NAME_ONLY}: %s</li> - * <li> {#CROSS_SIM_SPN_FORMAT_CARRIER_NAME_WITH_BRANDING}: %s Cross-SIM Calling</li> + * <li> {@link #CROSS_SIM_SPN_FORMAT_CARRIER_NAME_ONLY}: %s</li> + * <li> {@link #CROSS_SIM_SPN_FORMAT_CARRIER_NAME_WITH_BRANDING}: %s Cross-SIM Calling</li> * </ul> * %s will be filled with carrier name */ |