commit 6f4151d3d7ce25e14454189c4a57aeaf5f650272
author Daniel Bright <dbright@google.com> Thu Jan 09 12:37:59 2020 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 09 12:37:59 2020 -0800
tree d72595b623bd60a5e06640e8041e69f3d2b77ae9
parent c975b2d949d0a78c446443020b8de000a30fa4f4
parent a9298cc06f00efcad0386aa7b142dc735946a352

Merge "Flipping NR signal strengths coming from HAL"
am: a9298cc06f

Change-Id: Ia0e6fe2c86d0110c004d0176e32f900b8b45061d

telephony/java/android/telephony/CellSignalStrengthNr.java

diff --git a/telephony/java/android/telephony/CellSignalStrengthNr.java b/telephony/java/android/telephony/CellSignalStrengthNr.java
index f31fafe..d28d750 100644
--- a/telephony/java/android/telephony/CellSignalStrengthNr.java
+++ b/telephony/java/android/telephony/CellSignalStrengthNr.java
@@ -155,7 +155,17 @@
      * @param ss signal strength from modem.
      */
     public CellSignalStrengthNr(android.hardware.radio.V1_4.NrSignalStrength ss) {
-        this(ss.csiRsrp, ss.csiRsrq, ss.csiSinr, ss.ssRsrp, ss.ssRsrq, ss.ssSinr);
+        this(flip(ss.csiRsrp), flip(ss.csiRsrq), ss.csiSinr, flip(ss.ssRsrp), flip(ss.ssRsrq),
+                ss.ssSinr);
+    }
+
+    /**
+     * Flip sign cell strength value when taking in the value from hal
+     * @param val cell strength value
+     * @return flipped value
+     */
+    private static int flip(int val) {
+        return val != CellInfo.UNAVAILABLE ? -val : val;
     }
 
     /**