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

Commit d41acbda authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Made the comment more clear" am: 5bb8151a 

Change-Id: Iafc60dfd0eccbc4fde177e076f178aaff700be91
parents 34aaecf4 5bb8151a

telephony/java/android/telephony/CarrierConfigManager.java

+2 −1
Original line number Diff line number Diff line
@@ -839,7 +839,8 @@ public class CarrierConfigManager { 
    /**

     * The default flag specifying whether ETWS/CMAS test setting is forcibly disabled in

     * Settings->More->Emergency broadcasts menu even though developer options is turned on.

     * @deprecated moved to cellbroadcastreceiver resource show_test_settings

     * @deprecated Use {@code com.android.cellbroadcastreceiver.CellBroadcastReceiver} resource

     * {@code show_test_settings} to control whether to show test alert settings or not.

     */

    @Deprecated

    public static final String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL =