commit 8c8ba47ca40de0fc143cfc4edc4b452736a9db8d
author Nathan Harold <nharold@google.com> Tue Aug 29 20:41:36 2017 -0700
committer Nathan Harold <nharold@google.com> Wed Sep 13 15:32:49 2017 -0700
tree 30bcac4865f580e341f26adcd81268ad765d90c5
parent 4ff424ce6c9ad1efa2d303dc0d469a0a1c3a62e5

Fix docstrings for RIL_CellIdentity

Update the documentation to match the current CTS
requirements for Cell Identity reporting.

-For LTE, WCDMA, and GSM require that the channel
 number be reported.
-For LTE and WCDMA, require that the correct
 physical channel identifier be reported. Note that
 due to b/32774471 we still cannot require BSIC
 to be reported.

Bug: 65174915
Test: none, comment-only change
Change-Id: I93fcce3b39401e8965f724722361c2cadc4a88cc
Merged-In: I93fcce3b39401e8965f724722361c2cadc4a88cc
(cherry picked from commit 8d2d747e9edcd6f3d20ddffe2c6ca80b61766c1e)

current.txt

diff --git a/current.txt b/current.txt
index 2ad1e09..a3ff61e 100644
--- a/current.txt
+++ b/current.txt
@@ -220,3 +220,6 @@
 b18caefefcc765092412285d776234fcf213b73bdf07ae1b67a5f71b2d2464e3 android.hardware.wifi.offload@1.0::types
 c26473e2e4a00af43e28a0ddf9002e5062a7d0940429e5efb6e5513a8abcb75c android.hardware.wifi@1.1::IWifi
 b056e1defab4071584214584057d0bc73a613081bf1152590549649d4582c13c android.hardware.wifi@1.1::IWifiChip
+
+# HALs released in Android O MR1 (Final Set)
+0a159f81359cd4f71bbe00972ee8403ea79351fb7c0cd48be72ebb3e424dbaef android.hardware.radio@1.0::types

radio/1.0/types.hal

diff --git a/radio/1.0/types.hal b/radio/1.0/types.hal
index c5d7f8a..4d22bc0 100644
--- a/radio/1.0/types.hal
+++ b/radio/1.0/types.hal
@@ -1507,8 +1507,8 @@
     int32_t lac;                          // 16-bit Location Area Code, 0..65535, INT_MAX if unknown
     int32_t cid;                          // 16-bit GSM Cell Identity described in
                                           // TS 27.007, 0..65535, INT_MAX if unknown
-    int32_t arfcn;                        // 16-bit GSM Absolute RF channel number, INT_MAX if
-                                          // unknown
+    int32_t arfcn;                        // 16-bit GSM Absolute RF channel number; this value must
+                                          // be valid
     uint8_t bsic;                         // 6-bit Base Station Identity Code, 0xFF if unknown
 };
 
@@ -1520,9 +1520,9 @@
     int32_t cid;                          // 28-bit UMTS Cell Identity described in
                                           // TS 25.331, 0..268435455, INT_MAX if unknown
     int32_t psc;                          // 9-bit UMTS Primary Scrambling Code described in
-                                          // TS 25.331, 0..511, INT_MAX if unknown
-    int32_t uarfcn;                       // 16-bit UMTS Absolute RF Channel Number, INT_MAX if
-                                          // unknown
+                                          // TS 25.331, 0..511; this value must be valid
+    int32_t uarfcn;                       // 16-bit UMTS Absolute RF Channel Number; this value must
+                                          // be valid
 };
 
 struct CellIdentityCdma {
@@ -1547,10 +1547,10 @@
                                           // unknown
     int32_t ci;                           // 28-bit Cell Identity described in TS TS 27.007, INT_MAX
                                           // if unknown
-    int32_t pci;                          // physical cell id 0..503, INT_MAX if unknown
+    int32_t pci;                          // physical cell id 0..503; this value must be valid
     int32_t tac;                          // 16-bit tracking area code, INT_MAX if unknown
-    int32_t earfcn;                       // 18-bit LTE Absolute RC Channel Number, INT_MAX if
-                                          // unknown
+    int32_t earfcn;                       // 18-bit LTE Absolute RF Channel Number; this value must
+                                          // be valid
 };
 
 struct CellIdentityTdscdma {