diff options
| author | Jack Yu <jackyu@google.com> | 2020-01-14 15:07:43 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-14 15:07:43 -0800 |
| commit | b321ddb2f27009d3f37b9d4280a40d5502e9ab89 (patch) | |
| tree | 4cb70b100bed954f6f5e4a17f17b4bca528992ee /core/java/android | |
| parent | 383e36c9aa196b0e122724a475f796b5b6f5367b (diff) | |
| parent | 8027ca9b97fa728e0ca603f858407e43c4c5c42b (diff) | |
Merge changes from topic "remove_dev_mode"
am: 8027ca9b97
Change-Id: I2a03d3286d8e2884c2ecb18b1b7f9c7ef18f963d
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Telephony.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index aa1756a2d540..90ac821363b2 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4093,7 +4093,6 @@ public final class Telephony { * <li>{@link #ENABLE_CMAS_PRESIDENTIAL_PREF}</li> * <li>{@link #ENABLE_ALERT_VIBRATION_PREF}</li> * <li>{@link #ENABLE_EMERGENCY_PERF}</li> - * <li>{@link #ENABLE_FULL_VOLUME_PREF}</li> * <li>{@link #ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF}</li> * </ul> * @hide @@ -4156,10 +4155,6 @@ public final class Telephony { public static final @NonNull String ENABLE_EMERGENCY_PERF = "enable_emergency_alerts"; - /** Preference to enable volume for alerts */ - public static final @NonNull String ENABLE_FULL_VOLUME_PREF = - "use_full_volume"; - /** Preference to enable receive alerts in second language */ public static final @NonNull String ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF = "receive_cmas_in_second_language"; |