diff options
| author | SongFerng Wang <songferngwang@google.com> | 2019-12-13 13:27:54 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-13 13:27:54 -0800 |
| commit | 4b108f74f6f18de69f998373e43d2eb8d5af7449 (patch) | |
| tree | 3b407f8cd46aa618736369d465ad2e5a53e6cb6c /core/java/android | |
| parent | 68a76f5c4c2c269fc3130ee1d7b8222840a8cd9d (diff) | |
| parent | 72f579d5f26239202ab297e354873192856ed45d (diff) | |
Merge "ServiceState merges voice and data into a single value"
am: 72f579d5f2
Change-Id: I371f56959c9d1204022c37b67c8f821ed737297d
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Telephony.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index ebdde0a54a86..8a3d79c2eb31 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4479,7 +4479,7 @@ public final class Telephony { /** * The current registered voice network operator name in long alphanumeric format. * <p> - * This is the same as {@link ServiceState#getVoiceOperatorAlphaLong()}. + * This is the same as {@link ServiceState#getOperatorAlphaLong()}. * @hide */ public static final String VOICE_OPERATOR_ALPHA_LONG = "voice_operator_alpha_long"; @@ -4490,12 +4490,11 @@ public final class Telephony { * In GSM/UMTS, short format can be up to 8 characters long. The current registered voice * network operator name in long alphanumeric format. * <p> - * This is the same as {@link ServiceState#getVoiceOperatorAlphaShort()}. + * This is the same as {@link ServiceState#getOperatorAlphaShort()}. * @hide */ public static final String VOICE_OPERATOR_ALPHA_SHORT = "voice_operator_alpha_short"; - /** * The current registered operator numeric id. * <p> @@ -4509,7 +4508,7 @@ public final class Telephony { /** * The current registered data network operator name in long alphanumeric format. * <p> - * This is the same as {@link ServiceState#getDataOperatorAlphaLong()}. + * This is the same as {@link ServiceState#getOperatorAlphaLong()}. * @hide */ public static final String DATA_OPERATOR_ALPHA_LONG = "data_operator_alpha_long"; @@ -4517,7 +4516,7 @@ public final class Telephony { /** * The current registered data network operator name in short alphanumeric format. * <p> - * This is the same as {@link ServiceState#getDataOperatorAlphaShort()}. + * This is the same as {@link ServiceState#getOperatorAlphaShort()}. * @hide */ public static final String DATA_OPERATOR_ALPHA_SHORT = "data_operator_alpha_short"; @@ -4525,7 +4524,7 @@ public final class Telephony { /** * The current registered data network operator numeric id. * <p> - * This is the same as {@link ServiceState#getDataOperatorNumeric()}. + * This is the same as {@link ServiceState#getOperatorNumeric()}. * @hide */ public static final String DATA_OPERATOR_NUMERIC = "data_operator_numeric"; |