From 8c9a0d799366829d8997b2168d8afa5bb64483e7 Mon Sep 17 00:00:00 2001
From: Chris <chris@cypheros.co>
Date: Mon, 16 Jul 2018 16:19:41 -0400
Subject: [PATCH] telephony: Conditionally ignore RSSNR signal level

Doesn't work properly on some devices, so allow those devices to disable this.
Based on the phhusson treble patch.

Change-Id: I513d8a1abf3faa8ac81e9c8f0ef7f12a2ebe218d
Signed-off-by: Adesh15 <adesikha15@gmail.com>
---
 core/res/res/values/custom_config.xml                | 3 +++
 core/res/res/values/custom_symbols.xml               | 3 +++
 telephony/java/android/telephony/SignalStrength.java | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/core/res/res/values/custom_config.xml b/core/res/res/values/custom_config.xml
index a6dd60c2310c..7302bf956bcf 100644
--- a/core/res/res/values/custom_config.xml
+++ b/core/res/res/values/custom_config.xml
@@ -127,4 +127,7 @@
     <!-- Whether to cleanup fingerprints upon connection to the daemon and when user switches -->
     <bool name="config_cleanupUnusedFingerprints">true</bool>
 
+    <!-- Whether device ignores the RSSNR signal implementation -->
+    <bool name="config_ignoreRssnrSignalLevel">false</bool>
+
 </resources>
diff --git a/core/res/res/values/custom_symbols.xml b/core/res/res/values/custom_symbols.xml
index 9d8d0f84eccc..11a197c96c4c 100644
--- a/core/res/res/values/custom_symbols.xml
+++ b/core/res/res/values/custom_symbols.xml
@@ -112,4 +112,7 @@
     <!-- Icon packs -->
     <java-symbol type="drawable" name="adaptive_icon_drawable_wrapper" />
 
+    <!-- Whether device ignores the RSSNR signal implementation -->
+    <java-symbol type="bool" name="config_ignoreRssnrSignalLevel" />
+
 </resources>
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index 4e5639683a76..79f3f34db93d 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -897,6 +897,13 @@ else if (mLteRssnr >= -200)
                 + rsrpIconLevel + " snrIconLevel:" + snrIconLevel
                 + " lteRsrpBoost:" + mLteRsrpBoost);
 
+        boolean rssnrIgnored = Resources.getSystem().getBoolean(
+                com.android.internal.R.bool.config_ignoreRssnrSignalLevel);
+        if (rssnrIgnored) {
+            // Ignore RSSNR
+            if (rsrpIconLevel != -1) return rsrpIconLevel;
+        }
+
         /* Choose a measurement type to use for notification */
         if (snrIconLevel != -1 && rsrpIconLevel != -1) {
             /*