From e0ab4318ccd572e8939af960f297ee9fb19cb1cb Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Tue, 4 Feb 2020 21:29:47 +0800
Subject: [PATCH] Config of LTE signal strength default value remove SNR

parameters_used_for_lte_signal_bar_int default value set
"RSRP = 1 << 0"

Bug: 146317112
Test: 1. atest SignalStrengthTest.java
2. atest cts/tests/tests/telephony/current/src/android/telephony/cts/SignalStrengthTest.java
Change-Id: I75d5719a743ce815990a17c640bfb15e47d7802a
Merged-In: Ifd8ba60f112832aac975974e5f29290ac48c18b2
---
 telephony/java/android/telephony/CarrierConfigManager.java  | 4 ++--
 telephony/java/android/telephony/CellSignalStrengthLte.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 1eed0e02f9bd1..af6b239a38032 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -2321,7 +2321,7 @@ public class CarrierConfigManager {
      *  {@link CellSignalStrengthLte#USE_RSRQ}, {@link CellSignalStrengthLte#USE_RSSNR}.
      *
      * For example, if both RSRP and RSRQ are used, the value of key is 3 (1 << 0 | 1 << 1).
-     * If the key is invalid or not configured, a default value (RSRP | RSSNR = 1 << 0 | 1 << 2)
+     * If the key is invalid or not configured, a default value (RSRP = 1 << 0)
      * will apply.
      *
      * @hide
@@ -3891,7 +3891,7 @@ public class CarrierConfigManager {
         sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);
         sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000);
         sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT,
-                CellSignalStrengthLte.USE_RSRP | CellSignalStrengthLte.USE_RSSNR);
+                CellSignalStrengthLte.USE_RSRP);
     }
 
     /**
diff --git a/telephony/java/android/telephony/CellSignalStrengthLte.java b/telephony/java/android/telephony/CellSignalStrengthLte.java
index 6d6eaa4677f03..4978dc1d6f631 100644
--- a/telephony/java/android/telephony/CellSignalStrengthLte.java
+++ b/telephony/java/android/telephony/CellSignalStrengthLte.java
@@ -181,7 +181,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
         mCqi = CellInfo.UNAVAILABLE;
         mTimingAdvance = CellInfo.UNAVAILABLE;
         mLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
-        mParametersUseForLevel = USE_RSRP | USE_RSSNR;
+        mParametersUseForLevel = USE_RSRP;
     }
 
     /** {@inheritDoc} */
@@ -236,7 +236,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
         int[] rsrpThresholds, rsrqThresholds, rssnrThresholds;
         boolean rsrpOnly;
         if (cc == null) {
-            mParametersUseForLevel = USE_RSRP | USE_RSSNR;
+            mParametersUseForLevel = USE_RSRP;
             rsrpThresholds = sRsrpThresholds;
             rsrqThresholds = sRsrqThresholds;
             rssnrThresholds = sRssnrThresholds;