Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Iafc60dfd0eccbc4fde177e076f178aaff700be91
This commit is contained in:
Automerger Merge Worker
2020-02-19 19:49:55 +00:00
parent 34aaecf48c 5bb8151a47
commit d41acbdab8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -839,7 +839,8 @@ public class CarrierConfigManager {
/** /**
* The default flag specifying whether ETWS/CMAS test setting is forcibly disabled in * 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. * 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 @Deprecated
public static final String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = public static final String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL =