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

Commit 3daf8b89 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am:... 

Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: b24ba9d5 am: 2d45d999

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

Change-Id: I47ca8a9d0adcdc97e0ea6522028fa257ef081891
parents d5f8f2f0 2d45d999

core/api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -39096,7 +39096,6 @@ package android.telephony { 
    method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);

    method public void notifyConfigChangedForSubId(int);

    field public static final String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";

    field public static final int CARRIER_NR_AVAILABILITY_NONE = 0; // 0x0

    field public static final int CARRIER_NR_AVAILABILITY_NSA = 1; // 0x1

    field public static final int CARRIER_NR_AVAILABILITY_SA = 2; // 0x2

    field public static final int DATA_CYCLE_THRESHOLD_DISABLED = -2; // 0xfffffffe
@@ -39157,7 +39156,7 @@ package android.telephony { 
    field public static final String KEY_CARRIER_INSTANT_LETTERING_LENGTH_LIMIT_INT = "carrier_instant_lettering_length_limit_int";

    field public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";

    field public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";

    field public static final String KEY_CARRIER_NR_AVAILABILITY_INT = "carrier_nr_availability_int";

    field public static final String KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY = "carrier_nr_availabilities_int_array";

    field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";

    field public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING = "carrier_settings_activity_component_name_string";

    field public static final String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+15 −34
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ import android.telephony.ims.feature.RcsFeature; 
import com.android.internal.telephony.ICarrierConfigLoader;

import com.android.telephony.Rlog;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.concurrent.TimeUnit;



/**
@@ -110,31 +108,17 @@ public class CarrierConfigManager { 
     */

    public static final int USSD_OVER_IMS_ONLY       = 3;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = { "CARRIER_NR_AVAILABILITY_" }, value = {

            CARRIER_NR_AVAILABILITY_NONE,

            CARRIER_NR_AVAILABILITY_NSA,

            CARRIER_NR_AVAILABILITY_SA,

    })

    public @interface DeviceNrCapability {}



    /**

     * Indicates CARRIER_NR_AVAILABILITY_NONE determine that the carrier does not enable 5G NR.

     */

    public static final int CARRIER_NR_AVAILABILITY_NONE = 0;



    /**

     * Indicates CARRIER_NR_AVAILABILITY_NSA determine that the carrier enable the non-standalone

     * (NSA) mode of 5G NR.

     */

    public static final int CARRIER_NR_AVAILABILITY_NSA = 1 << 0;

    public static final int CARRIER_NR_AVAILABILITY_NSA = 1;



    /**

     * Indicates CARRIER_NR_AVAILABILITY_SA determine that the carrier enable the standalone (SA)

     * mode of 5G NR.

     */

    public static final int CARRIER_NR_AVAILABILITY_SA = 1 << 1;

    public static final int CARRIER_NR_AVAILABILITY_SA = 2;



    private final Context mContext;
@@ -1807,23 +1791,20 @@ public class CarrierConfigManager { 
            "show_precise_failed_cause_bool";



    /**

     * Bit-field integer to determine whether the carrier enable the non-standalone (NSA) mode of

     * 5G NR, standalone (SA) mode of 5G NR

     * A list of carrier nr availability is used to determine whether the carrier enable the

     * non-standalone (NSA) mode of 5G NR, standalone (SA) mode of 5G NR

     *

     * <UL>

     *  <LI>CARRIER_NR_AVAILABILITY_NONE: non-NR = 0 </LI>

     *  <LI>CARRIER_NR_AVAILABILITY_NSA: NSA = 1 << 0</LI>

     *  <LI>CARRIER_NR_AVAILABILITY_SA: SA = 1 << 1</LI>

     * </UL>

     * <p> The value of this key must be bitwise OR of

     * {@link #CARRIER_NR_AVAILABILITY_NONE}, {@link #CARRIER_NR_AVAILABILITY_NSA},

     * {@link #CARRIER_NR_AVAILABILITY_SA}.

     * <p> The value of list is

     * {@link #CARRIER_NR_AVAILABILITY_NSA}, or {@link #CARRIER_NR_AVAILABILITY_SA}.

     *

     * <p> For example, if both NSA and SA are used, the value of key is 3 (1 << 0 | 1 << 1).

     * If the carrier doesn't support 5G NR, the value of key is 0 (non-NR).

     * If the key is invalid or not configured, a default value 3 (NSA|SA = 3) will apply.

     * <p> For example, if both NSA and SA are used, the list value is {

     * {@link #CARRIER_NR_AVAILABILITY_NSA},{@link #CARRIER_NR_AVAILABILITY_SA}}.

     * If the carrier doesn't support 5G NR, the value is the empty array.

     * If the key is invalid or not configured, the default value {

     * {@link #CARRIER_NR_AVAILABILITY_NSA},{@link #CARRIER_NR_AVAILABILITY_SA}} will apply.

     */

    public static final String KEY_CARRIER_NR_AVAILABILITY_INT = "carrier_nr_availability_int";

    public static final String KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY =

            "carrier_nr_availabilities_int_array";



    /**

     * Boolean to decide whether LTE is enabled.
@@ -4653,8 +4634,8 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING, "");

        sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, true);

        sDefaults.putInt(KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT, 20000);

        sDefaults.putInt(KEY_CARRIER_NR_AVAILABILITY_INT,

                CARRIER_NR_AVAILABILITY_NSA | CARRIER_NR_AVAILABILITY_SA);

        sDefaults.putIntArray(KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,

                new int[]{CARRIER_NR_AVAILABILITY_NSA, CARRIER_NR_AVAILABILITY_SA});

        sDefaults.putBoolean(KEY_LTE_ENABLED_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_TDSCDMA_BOOL, false);

        sDefaults.putStringArray(KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY, null);