summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pengquan Meng <mpq@google.com> 2019-04-25 18:00:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-25 18:00:36 +0000
commit9adb3e75f22562f1efe18d37521a230fd9ece69f (patch)
treeea9a5004c09dc7fb28d1818d7d75b0db013f0e9c
parent5b698fcc4eab85c1828114cc4cd39b5939eaf5f4 (diff)
parent7ac9a8f314ad8be530f6745a947b90bfcff9495c (diff)
Merge "Fixed the comment of carrier config for CDNR" into qt-dev
-rwxr-xr-xtelephony/java/android/telephony/CarrierConfigManager.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 26745a7363f1..2d8a280873f6 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1202,7 +1202,7 @@ public class CarrierConfigManager {
* Override the SPN Display Condition 2 integer bits (lsb). B2, B1 is the last two bits of the
* spn display condition coding.
*
- * The default value -1 mean this field is not config.
+ * The default value -1 mean this field is not set.
*
* B1 = 0: display of registered PLMN name not required when registered PLMN is either HPLMN
* or a PLMN in the service provider PLMN list (see EF_SPDI).
@@ -1241,7 +1241,7 @@ public class CarrierConfigManager {
/**
* Override the PNN - a string array of comma-separated alpha long and short names:
- * "alpha_long1, alpha_short1".
+ * "alpha_long1,alpha_short1".
*
* Reference: 3GPP TS 31.102 v15.2.0 Section 4.2.58 EF_PNN.
* @hide
@@ -1259,6 +1259,8 @@ public class CarrierConfigManager {
/**
* Allow ERI rules to select a carrier name display string when using 3gpp2 access technologies.
+ * If this bit is not set, the carrier name display string will be selected from the carrier
+ * display name resolver which doesn't apply the ERI rules.
*
* @hide
*/