From 105fe9349abe7849ff5050bf6d808519d141b2b0 Mon Sep 17 00:00:00 2001 From: Rambo Wang Date: Thu, 26 Mar 2020 12:35:38 -0700 Subject: [PATCH] NR is lower priority than all other signal strengths aosp/891956 introduced signal strengths support for NR. In the method SignalStrength.getPrimary, NR is the lowest priority. This is against the policy which is in the comment, saying "prioritizing newer faster RATs". Bug: 148634820 Test: atest com.android.internal.telephony.SignalStrengthTest Change-Id: Ia9055c9e8cd8d09cdd3f101750c9f9cea983a9f8 Merged-In: Ia9055c9e8cd8d09cdd3f101750c9f9cea983a9f8 (cherry picked from commit 8e56e11eab594435d492be54ddf4bff401c218b2) --- telephony/java/android/telephony/SignalStrength.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index 16fbd07f9495c..ad6439c154ca0 100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -190,12 +190,12 @@ 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 (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; }