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

Commit 4048d32e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 04d262db to... 

Merge "resolve merge conflicts of 04d262db to pi-dev-plus-aosp" into pi-dev-plus-aosp
parents 3d1b2b22 7a3b8109

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -2491,6 +2491,13 @@ public class CarrierConfigManager { 
    public static final String KEY_5G_ICON_CONFIGURATION_STRING =

            "5g_icon_configuration_string";



    /**

     * Indicates use 3GPP application to replace 3GPP2 application even if it's a CDMA/CDMA-LTE

     * phone, becasue some carriers's CSIM application is present but not supported.

     * @hide

     */

    public static final String KEY_USE_USIM_BOOL = "use_usim_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -2872,6 +2879,7 @@ public class CarrierConfigManager { 
                });

        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,

                "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");

        sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);

    }



    /**