commit 68c58a57b01728a517150e09877400d85520a1df
author SongFerngWang <songferngwang@google.com> Mon Apr 13 18:13:04 2020 +0800
committer SongFerngWang <songferngwang@google.com> Tue Apr 14 11:16:47 2020 +0800
tree dc27ebd17bb7441264132aaca301daf7d213d4e6
parent ec38d551e392fc1825bbaab527890095aebf2f66

For NR (non-standalone), use LTE signal strength as primary rule

There are two signal strengths, NR and LTE signal strength,
during NR (non-standalone). A lot of carriers' requirement define
UE show LTE signal strength on status bar during
NR (non-standalone).
Add a carrier config whether to use LTE signal strength as
primary during NR (non-standalone)

Bug: 152864241
Test: make pass.
Change-Id: Ib13d73719dace2d80aee5669181f4f934316ffd1

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 7f6e123..545c8a3 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -2529,6 +2529,16 @@
             "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.
      * @hide
@@ -4095,6 +4105,7 @@
                 });
         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",