commit 9c2fae46a9784af4a2f8d2274817e81bb18abfd1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 19 23:16:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 19 23:16:32 2020 +0000
tree f2ccf3ccc68608dd93f48047a86344405c6acb04
parent f49cd396c8c2a95d8d2159ee0ad0b5596e404d70
parent 730f2ff7de008b69f9d87847023d704db127a782

Merge "Made the comment more clear" am: 5bb8151a47 am: d41acbdab8 am: 730f2ff7de

Change-Id: Ie4044843b40beb670ceab777c5b9906a19bb2d1c

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 9924839c..985e883 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -838,7 +838,8 @@
     /**
      * 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 =