commit 90a59372b4d13f3b01c2832c5a22d95318d4d021
author Luca Weiss <luca.weiss@fairphone.com> Thu Aug 05 15:11:26 2021 +0200
committer Luca Weiss <luca.weiss@fairphone.com> Fri Aug 27 11:41:21 2021 +0200
tree 4fc216a39b8c0d02c47e0d68ca42c85485d39768
parent 954d12421a57d9c759c9ee2e81d0e38e561986e3

Clamp more cell info values

As with LTE rsrp these values also need clamping as they're sometimes
outside of the expected values.

Test: run cts-dev -m CtsTelephonyTestCases -t android.telephony.cts.CellInfoTest#testCellInfo
Issue: FP2A10-44
Change-Id: Id737049665673ad4f578620dcd16f71e0257b996

libril/ril_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index e5fbebe..c4f57d6 100755
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -7984,10 +7984,10 @@
                         rillCellInfo->CellInfo.wcdma.cellIdentityWcdma.cid;
                 cellInfoWcdma->cellIdentityWcdma.psc =
                         rillCellInfo->CellInfo.wcdma.cellIdentityWcdma.psc;
-                cellInfoWcdma->cellIdentityWcdma.uarfcn =
-                        rillCellInfo->CellInfo.wcdma.cellIdentityWcdma.uarfcn;
-                cellInfoWcdma->signalStrengthWcdma.signalStrength =
-                        rillCellInfo->CellInfo.wcdma.signalStrengthWcdma.signalStrength;
+                cellInfoWcdma->cellIdentityWcdma.uarfcn = clampWarn("uarfcn",
+                        rillCellInfo->CellInfo.wcdma.cellIdentityWcdma.uarfcn, 412, 11000);
+                cellInfoWcdma->signalStrengthWcdma.signalStrength = clampWarn("signalStrength",
+                        rillCellInfo->CellInfo.wcdma.signalStrengthWcdma.signalStrength, 0, 31);
                 cellInfoWcdma->signalStrengthWcdma.bitErrorRate =
                         rillCellInfo->CellInfo.wcdma.signalStrengthWcdma.bitErrorRate;
                 break;
@@ -8032,8 +8032,8 @@
                         rillCellInfo->CellInfo.lte.cellIdentityLte.pci;
                 cellInfoLte->cellIdentityLte.tac =
                         rillCellInfo->CellInfo.lte.cellIdentityLte.tac;
-                cellInfoLte->cellIdentityLte.earfcn =
-                        rillCellInfo->CellInfo.lte.cellIdentityLte.earfcn;
+                cellInfoLte->cellIdentityLte.earfcn = clampWarn("earfcn",
+                        rillCellInfo->CellInfo.lte.cellIdentityLte.earfcn, 7, 262136);
                 cellInfoLte->signalStrengthLte.signalStrength =
                         rillCellInfo->CellInfo.lte.signalStrengthLte.signalStrength;
                 cellInfoLte->signalStrengthLte.rsrp = clampWarn("rsrp",