commit 161621380892d211e3e79b2b8eca398db5f8a2bb
author nharold <nharold@google.com> Wed Jan 17 07:07:54 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 17 07:07:54 2018 +0000
tree b7456a1966eb7e6e10195cd6ee6af343749e17f3
parent d63a259aa98e0b7a28e381749dbc03eddb618874
parent 48306e0a06586fe76c4177ffb96adb1339a43b3f

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

Change-Id: I6c73af383295d0c53e2b3451d61cfccb1ba2a441

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 5a1a3e3..ce0b551 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -960,8 +960,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";