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

Commit ef0868a8 authored by SongFerng Wang's avatar SongFerng Wang Committed by Gerrit Code Review
Browse files

Merge changes Ib13d7371,Ia9055c9e 

* changes:
  For NR (non-standalone), use LTE signal strength as primary rule
  NR is lower priority than all other signal strengths
parents 54ac3c69 8893662f

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -2511,6 +2511,16 @@ public class CarrierConfigManager { 
    public static final String KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT =

            "parameters_use_for_5g_nr_signal_bar_int";



    /**

     * There are two signal strengths, NR and LTE signal strength, during NR (non-standalone).

     * Boolean indicating whether to use LTE signal strength as primary during NR (non-standalone).

     * By default this value is true.

     *

     * @hide

     */

    public static final String KEY_SIGNAL_STRENGTH_NR_NSA_USE_LTE_AS_PRIMARY_BOOL =

            "signal_strength_nr_nsa_use_lte_as_primary_bool";



    /**

     * String array of default bandwidth values per network type.

     * The entries should be of form "network_name:downstream,upstream", with values in Kbps.
@@ -4024,6 +4034,7 @@ public class CarrierConfigManager { 
                });

        sDefaults.putInt(KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT,

                CellSignalStrengthNr.USE_SSRSRP);

        sDefaults.putBoolean(KEY_SIGNAL_STRENGTH_NR_NSA_USE_LTE_AS_PRIMARY_BOOL, true);

        sDefaults.putStringArray(KEY_BANDWIDTH_STRING_ARRAY, new String[]{

                "GPRS:24,24", "EDGE:70,18", "UMTS:115,115", "CDMA-IS95A:14,14", "CDMA-IS95B:14,14",

                "1xRTT:30,30", "EvDo-rev.0:750,48", "EvDo-rev.A:950,550", "HSDPA:4300,620",

telephony/java/android/telephony/SignalStrength.java

+11 −1
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ public class SignalStrength implements Parcelable { 
    // Effectively final. Timestamp is set during construction of SignalStrength

    private long mTimestampMillis;



    private boolean mLteAsPrimaryInNrNsa = true;



    CellSignalStrengthCdma mCdma;

    CellSignalStrengthGsm mGsm;

    CellSignalStrengthWcdma mWcdma;
@@ -190,12 +192,16 @@ public class SignalStrength implements Parcelable { 
    private CellSignalStrength getPrimary() {

        // This behavior is intended to replicate the legacy behavior of getLevel() by prioritizing

        // newer faster RATs for default/for display purposes.



        if (mLteAsPrimaryInNrNsa) {

            if (mLte.isValid()) return mLte;

        }

        if (mNr.isValid()) return mNr;

        if (mLte.isValid()) return mLte;

        if (mCdma.isValid()) return mCdma;

        if (mTdscdma.isValid()) return mTdscdma;

        if (mWcdma.isValid()) return mWcdma;

        if (mGsm.isValid()) return mGsm;

        if (mNr.isValid()) return mNr;

        return mLte;

    }
@@ -270,6 +276,10 @@ public class SignalStrength implements Parcelable { 


    /** @hide */

    public void updateLevel(PersistableBundle cc, ServiceState ss) {

        if (cc != null) {

            mLteAsPrimaryInNrNsa = cc.getBoolean(

                    CarrierConfigManager.KEY_SIGNAL_STRENGTH_NR_NSA_USE_LTE_AS_PRIMARY_BOOL, true);

        }

        mCdma.updateLevel(cc, ss);

        mGsm.updateLevel(cc, ss);

        mWcdma.updateLevel(cc, ss);