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

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

Merge "Add carrier config for 5G Icon" am: 2aee6901

am: 14a78540

Change-Id: I2697bd8d2df5ef9a519b29bed577d81c3043266a
parents d5139f1b 14a78540
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
@@ -2437,6 +2437,32 @@ public class CarrierConfigManager {
    public static final String KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY =
            "cdma_enhanced_roaming_indicator_for_home_network_int_array";

    /**
     * This configuration allow the system UI to display different 5G icon for different 5G status.
     *
     * There are four 5G status:
     * 1. connected_mmwave: device currently connected to 5G cell as the secondary cell and using
     *    millimeter wave.
     * 2. connected: device currently connected to 5G cell as the secondary cell but not using
     *    millimeter wave.
     * 3. not_restricted: device camped on a network that has 5G capability(not necessary to connect
     *    a 5G cell as a secondary cell) and the use of 5G is not restricted.
     * 4. restricted: device camped on a network that has 5G capability(not necessary to connect a
     *    5G cell as a secondary cell) but the use of 5G is restricted.
     *
     * The configured string contains multiple key-value pairs separated by comma. For each pair,
     * the key and value is separated by a colon. The key is corresponded to a 5G status above and
     * the value is the icon name. Use "None" as the icon name if no icon should be shown in a
     * specific 5G status.
     *
     * Here is an example of the configuration:
     * "connected_mmwave:5GPlus,connected:5G,not_restricted:None,restricted:None"
     *
     * @hide
     */
    public static final String KEY_5G_ICON_CONFIGURATION_STRING =
            "5g_icon_configuration_string";

    /** The default value for every variable. */
    private final static PersistableBundle sDefaults;

@@ -2814,6 +2840,8 @@ public class CarrierConfigManager {
                new int[] {
                        1 /* Roaming Indicator Off */
                });
        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,
                "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");
    }

    /**