commit 03dafac4957918c85ca2c971d24c4d9ab80890a3
author nharold <nharold@google.com> Wed Jan 17 06:51:38 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 17 06:51:38 2018 +0000
tree fd35d0937c127093d17d645d1aff853a4f5d6e63
parent d69921cc9ae912f0bae572f56f3aa6bb86b006a8
parent fa6187510a272413cb22b4590ba62d1977539847

Merge "Update documentation for KEY_CARRIER_NAME_STRING"
am: fa6187510a

Change-Id: I50fe5f4ea30b6923e7ca5c0fe3eb62fa9db3dabf

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index d0fb982..0c05a02 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -950,8 +950,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";