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

Commit 7c80e2c0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a carrier config for WFC's carrier name override by ef_pnn" into... 

Merge "Add a carrier config for WFC's carrier name override by ef_pnn" into rvc-dev am: 29db7a6a am: 778a866f am: 5075bb53 am: ad8627a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11874044

Change-Id: I8c4ee1f7086d4d1165eea102a08830a8bdb7fa71
parents 8c2e59db ad8627a9

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -1421,6 +1421,14 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";



    /**

     * To override wifi calling's carrier name string using ef_pnn from sim card when SPN in empty.

     *

     * @hide

     */

    public static final String KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL =

            "wfc_carrier_name_override_by_pnn_bool";



    /**

     * Override the SPN Display Condition 2 integer bits (lsb). B2, B1 is the last two bits of the

     * spn display condition coding.
@@ -4057,6 +4065,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);

        sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);

        sDefaults.putString(KEY_CARRIER_NAME_STRING, "");

        sDefaults.putBoolean(KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL, false);

        sDefaults.putInt(KEY_SPN_DISPLAY_CONDITION_OVERRIDE_INT, -1);

        sDefaults.putStringArray(KEY_SPDI_OVERRIDE_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_PNN_OVERRIDE_STRING_ARRAY, null);