Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b321ddb2 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge changes from topic "remove_dev_mode" 

am: 8027ca9b

Change-Id: I2a03d3286d8e2884c2ecb18b1b7f9c7ef18f963d
parents 383e36c9 8027ca9b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -6980,7 +6980,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";

core/java/android/provider/Telephony.java

+0 −5
Original line number Diff line number Diff line
@@ -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";

telephony/java/android/telephony/CarrierConfigManager.java

+5 −2
Original line number Diff line number Diff line
@@ -855,9 +855,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";