From 8d2d747e9edcd6f3d20ddffe2c6ca80b61766c1e Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Tue, 29 Aug 2017 20:41:36 -0700 Subject: [PATCH] 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 --- current.txt | 1 + radio/1.0/types.hal | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/current.txt b/current.txt index f045fd852d..5207c6aa05 100644 --- a/current.txt +++ b/current.txt @@ -244,5 +244,6 @@ a432d6d9200248dc2126827bcd6cdea31dd65eff39b939f64585d27d915a5857 android.hardwar 86ba9c03978b79a742e990420bc5ced0673d25a939f82572996bef92621e2014 android.hardware.cas@1.0::IMediaCasService 503da837d1a67cbdb7c08a033e927e5430ae1b159d98bf72c6336b4dcc5e76f5 android.hardware.cas.native@1.0::types 619600109232ed64b827c8a11beed8070b1827ae464547d7aa146cf0473b4bca android.hardware.cas.native@1.0::IDescrambler +0a159f81359cd4f71bbe00972ee8403ea79351fb7c0cd48be72ebb3e424dbaef android.hardware.radio@1.0::types f4945e397b5dea41bb64518dfde59be71245d8a125fd1e0acffeb57ac7b08fed android.hardware.thermal@1.1::IThermal c8bc853546dd55584611def2a9fa1d99f657e3366c976d2f60fe6b8aa6d2cb87 android.hardware.thermal@1.1::IThermalCallback diff --git a/radio/1.0/types.hal b/radio/1.0/types.hal index c5d7f8aa04..4d22bc0f27 100644 --- a/radio/1.0/types.hal +++ b/radio/1.0/types.hal @@ -1507,8 +1507,8 @@ struct CellIdentityGsm { 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 @@ struct CellIdentityWcdma { 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 @@ struct CellIdentityLte { // 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 {