From 11cbc3b9f2aed6b2ca492ad2cc25a00c4669588f Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Mon, 25 Feb 2019 10:31:08 -0800
Subject: [PATCH] Fix Order of Operations for Converting RSSI to ASU

Due to the wrong order of operations, the conversion
from RSSI to ASU was returning bad results. Fix the
equation so that the ASU is correctly calculated.

Bug: 126199198
Test: (force device to GSM) - atest CellInfoTest
      verified on aosp_taimen

Change-Id: Iaeb9a2a6d8efb5b39fc1f81e8d2969694cc06422
---
 telephony/java/android/telephony/CellSignalStrength.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/CellSignalStrength.java b/telephony/java/android/telephony/CellSignalStrength.java
index 7d07a730f78bc..aaf6c714b9c9d 100644
--- a/telephony/java/android/telephony/CellSignalStrength.java
+++ b/telephony/java/android/telephony/CellSignalStrength.java
@@ -119,7 +119,7 @@ public abstract class CellSignalStrength {
     /** @hide */
     protected static final int getAsuFromRssiDbm(int dbm) {
         if (dbm == CellInfo.UNAVAILABLE) return 99;
-        return (dbm / 2) + 113;
+        return (dbm + 113) / 2;
     }
 
     // Range for RSCP in ASU (0-96, 255) as defined in TS 27.007 8.69