Merge "NR is lower priority than all other signal strengths" into rvc-dev am: 2939486f37

Change-Id: I28343ff22d88d207e7a64b8d6525e91d3692653c
This commit is contained in:
Rambo Wang
2020-03-27 23:49:47 +00:00
committed by Automerger Merge Worker

View File

@@ -188,12 +188,12 @@ public class SignalStrength implements Parcelable {
private CellSignalStrength getPrimary() { private CellSignalStrength getPrimary() {
// This behavior is intended to replicate the legacy behavior of getLevel() by prioritizing // This behavior is intended to replicate the legacy behavior of getLevel() by prioritizing
// newer faster RATs for default/for display purposes. // newer faster RATs for default/for display purposes.
if (mNr.isValid()) return mNr;
if (mLte.isValid()) return mLte; if (mLte.isValid()) return mLte;
if (mCdma.isValid()) return mCdma; if (mCdma.isValid()) return mCdma;
if (mTdscdma.isValid()) return mTdscdma; if (mTdscdma.isValid()) return mTdscdma;
if (mWcdma.isValid()) return mWcdma; if (mWcdma.isValid()) return mWcdma;
if (mGsm.isValid()) return mGsm; if (mGsm.isValid()) return mGsm;
if (mNr.isValid()) return mNr;
return mLte; return mLte;
} }