commit 48306e0a06586fe76c4177ffb96adb1339a43b3f
author nharold <nharold@google.com> Wed Jan 17 06:59:39 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 17 06:59:39 2018 +0000
tree 2d0ace6ff30d9673d0dfa32be0380cd3f30ed329
parent a92bcc33b28c53883e902db03c578c1edaf84f0d
parent 03dafac4957918c85ca2c971d24c4d9ab80890a3

Merge "Update documentation for KEY_CARRIER_NAME_STRING" am: fa6187510a
am: 03dafac495

Change-Id: I3c0e13153a347e6ef79cfee9f00a6ee6694425d9

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index e349ae9..ad09e33 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -963,8 +963,9 @@
     public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";
 
     /**
-     * String to identify carrier name in CarrierConfig app. This string is used only if
-     * #KEY_CARRIER_NAME_OVERRIDE_BOOL is true
+     * String to identify carrier name in CarrierConfig app. This string overrides SPN if
+     * #KEY_CARRIER_NAME_OVERRIDE_BOOL is true; otherwise, it will be used if its value is provided
+     * and SPN is unavailable
      * @hide
      */
     public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";