Merge "Do not migrate use full volume shared preference"
diff --git a/api/current.txt b/api/current.txt
index 5ab1c01..6515325 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45142,7 +45142,7 @@
field public static final String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
field public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool";
field public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
- field public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";
+ field @Deprecated public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";
field public static final String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
field public static final String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";
field public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";
diff --git a/api/system-current.txt b/api/system-current.txt
index a1bb3c8..ff8bfd8 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8109,7 +8109,6 @@
field @NonNull public static final String ENABLE_CMAS_PRESIDENTIAL_PREF = "enable_cmas_presidential_alerts";
field @NonNull public static final String ENABLE_CMAS_SEVERE_THREAT_PREF = "enable_cmas_severe_threat_alerts";
field @NonNull public static final String ENABLE_EMERGENCY_PERF = "enable_emergency_alerts";
- field @NonNull public static final String ENABLE_FULL_VOLUME_PREF = "use_full_volume";
field @NonNull public static final String ENABLE_PUBLIC_SAFETY_PREF = "enable_public_safety_messages";
field @NonNull public static final String ENABLE_STATE_LOCAL_TEST_PREF = "enable_state_local_test_alerts";
field @NonNull public static final String ENABLE_TEST_ALERT_PREF = "enable_test_alerts";
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 2e7ac3f5..f369064 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -4142,7 +4142,6 @@
* <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
@@ -4205,10 +4204,6 @@
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";
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 6a62237..8668536 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -848,9 +848,12 @@
"carrier_force_disable_etws_cmas_test_bool";
/**
- * The default flag specifying whether "Turn on Notifications" option will be always shown in
- * Settings->More->Emergency broadcasts menu regardless developer options is turned on or not.
+ * The default flag specifying whether "Allow alerts" option will be always shown in
+ * emergency alerts settings regardless developer options is turned on or not.
+ *
+ * @deprecated The allow alerts option is always shown now. No longer need a config for that.
*/
+ @Deprecated
public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL =
"always_show_emergency_alert_onoff_bool";