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

Commit 7a3b8109 authored by andychou's avatar andychou
Browse files

resolve merge conflicts of 04d262db to pi-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I2c7feea798df2d9bbfae4ee0847ef151b0d21511
Change-Id: I417960cc1c873425ef6b9b5d74f9bf5d9658a390
parents 4929093f 04d262db

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -2478,6 +2478,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;
@@ -2858,6 +2865,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);

    }



    /**