Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afbdf26a authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Fixed the comment of carrier config for CDNR" am: e994a0d6 am: 6f7ccba0

am: bf53e7f4

Change-Id: I882168f8448f4b709c4a22b68391e31af6eb69f1
parents 5d21de69 bf53e7f4
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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).
@@ -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
     */