From c3133cbc57fe00591a7881f1811b41e95209ab50 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Fri, 10 Jan 2020 17:24:58 -0800 Subject: [PATCH] Do not migrate use full volume shared preference Use full volume has been renamed to override DnD and the toggle is now only available for certain countries. We intended not to provide the ability to migrate this shared preference as it might cause issue for users who already changed the preference. After mainline migration, override DnD should be always reset to default value of that country. Test: Manual Bug: 147426188 Merged-In: I5746fe32674131b474e784bd5dd62ecff76386d5 Change-Id: I5746fe32674131b474e784bd5dd62ecff76386d5 (cherry picked from commit bcbe46816c7febb2641413e363cb634f7fb8f18b) --- api/current.txt | 2 +- api/system-current.txt | 1 - core/java/android/provider/Telephony.java | 5 ----- telephony/java/android/telephony/CarrierConfigManager.java | 7 +++++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5d706ec8004d7..0dcdb52050971 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44416,7 +44416,7 @@ package android.telephony { 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 63345c843173f..981e6a32295ec 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6947,7 +6947,6 @@ package android.provider { 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 aa1756a2d5405..90ac821363b26 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4093,7 +4093,6 @@ public final class Telephony { *
  • {@link #ENABLE_CMAS_PRESIDENTIAL_PREF}
    • *
  • {@link #ENABLE_ALERT_VIBRATION_PREF}
    • *
  • {@link #ENABLE_EMERGENCY_PERF}
    • - *
  • {@link #ENABLE_FULL_VOLUME_PREF}
    • *
  • {@link #ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF}
    • * * @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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index de99b0da77df5..4d357938326f8 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -847,9 +847,12 @@ public class CarrierConfigManager { "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";