From b09dd7ab44bbc3b1aa10781a09dc60b2b6f3c7e2 Mon Sep 17 00:00:00 2001
From: sqian <shuoq@google.com>
Date: Wed, 15 Jul 2020 00:37:39 +0000
Subject: [PATCH] Change range of SS-RSRQ per 3gpp

Bug: 159761054
Test: VTS
Merged-In: I377ef00015876b706ffeb20d9255c1b1ebf66c15
(cherry picked from commit cd3fd87d475a94b67d3544001cbfa0e2712fc7b6)
Change-Id: I7f9526e7073188c1a4c553da9c38d7892c55078d
---
 current.txt         | 2 ++
 radio/1.4/types.hal | 4 ++--
 radio/1.5/types.hal | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/current.txt b/current.txt
index 9677dba62f..bdbad8a3e0 100644
--- a/current.txt
+++ b/current.txt
@@ -652,6 +652,8 @@ b809193970a91ca637a4b0184767315601d32e3ef3d5992ffbc7a8d14a14f015 android.hardwar
 
 # ABI preserving changes to HALs during Android S
 cd84ab19c590e0e73dd2307b591a3093ee18147ef95e6d5418644463a6620076 android.hardware.neuralnetworks@1.2::IDevice
+38d65fb20c60a5b823298560fc0825457ecdc49603a4b4e94bf81511790737da android.hardware.radio@1.4::types
+954c334efd80e8869b66d1ce5fe2755712d96ba4b3c38d415739c330af5fb4cb android.hardware.radio@1.5::types
 
 # HALs released in Android S
 # NOTE: waiting to freeze HALs until later in the release
diff --git a/radio/1.4/types.hal b/radio/1.4/types.hal
index 393716b7ce..a830816822 100644
--- a/radio/1.4/types.hal
+++ b/radio/1.4/types.hal
@@ -1847,9 +1847,9 @@ struct NrSignalStrength {
     /**
      * SS reference signal received quality, multipled by -1.
      *
-     * Reference: 3GPP TS 38.215.
+     * Reference: 3GPP TS 38.215, 3GPP TS 38.133 section 10.
      *
-     * Range [3, 20], INT_MAX means invalid/unreported.
+     * Range [-20 dB, 43 dB], INT_MAX means invalid/unreported.
      */
     int32_t ssRsrq;
 
diff --git a/radio/1.5/types.hal b/radio/1.5/types.hal
index b061bd51c8..c1f3f0358e 100644
--- a/radio/1.5/types.hal
+++ b/radio/1.5/types.hal
@@ -107,9 +107,9 @@ enum SignalMeasurementType : int32_t {
     SSRSRP = 6,
     /**
      * 5G SS reference signal received quality.
-     * Range: -20 dB to -3 dB.
+     * Range: -43 dB to 20 dB.
      * Used RAN: NGRAN
-     * Reference: 3GPP TS 38.215.
+     * Reference: 3GPP TS 38.215, 3GPP TS 38.133 section 10
      */
     SSRSRQ = 7,
     /**