From 9cbb0b77c935b0a210850c8cb687b42053f9ea54 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Tue, 9 Jul 2019 11:01:04 -0700
Subject: [PATCH] Expose RSSI as GSM RAT-specific Signal Strength

In GSM, RSSI is the correct specific name for signal
strength measurements. To promote callers using specific
methods and to bring GSM in line with other FooSignalStrength
methods.

Bug: 125027693
Test: cts - CellInfoTest
Change-Id: Idf62c7fbf8d6dd1c116da35a5e6375851218053e
---
 api/current.txt                                            | 1 +
 .../java/android/telephony/CellSignalStrengthGsm.java      | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 015874d6e30cd..1d4896d005c52 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -42463,6 +42463,7 @@ package android.telephony {
     method public int getBitErrorRate();
     method public int getDbm();
     method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();
+    method public int getRssi();
     method public int getTimingAdvance();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthGsm> CREATOR;
diff --git a/telephony/java/android/telephony/CellSignalStrengthGsm.java b/telephony/java/android/telephony/CellSignalStrengthGsm.java
index 127eabd701ff4..31b3a0523b7c7 100644
--- a/telephony/java/android/telephony/CellSignalStrengthGsm.java
+++ b/telephony/java/android/telephony/CellSignalStrengthGsm.java
@@ -143,7 +143,7 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P
     }
 
     /**
-     * Get the signal strength as dBm
+     * Get the signal strength as dBm.
      */
     @Override
     public int getDbm() {
@@ -163,18 +163,17 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P
     }
 
     /**
-     * Return the Received Signal Strength Indicator
+     * Return the Received Signal Strength Indicator.
      *
      * @return the RSSI in dBm (-113, -51) or
      *         {@link android.telephony.CellInfo#UNAVAILABLE UNAVAILABLE}.
-     * @hide
      */
     public int getRssi() {
         return mRssi;
     }
 
     /**
-     * Return the Bit Error Rate
+     * Return the Bit Error Rate.
      *
      * @return the bit error rate (0-7, 99) as defined in TS 27.007 8.5 or
      *         {@link android.telephony.CellInfo#UNAVAILABLE UNAVAILABLE}.