From e82c301c474c0ccfcd42bfede2ccaac18c373391 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 Merged-In: I93fcce3b39401e8965f724722361c2cadc4a88cc (cherry picked from commit 8d2d747e9edcd6f3d20ddffe2c6ca80b61766c1e) --- current.txt | 5 ++++- radio/1.0/types.hal | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/current.txt b/current.txt index c152bb1a20..0828c6efa6 100644 --- a/current.txt +++ b/current.txt @@ -189,4 +189,7 @@ fe3c3c2f572b72f15f8594c538b0577bd5c28722c31879cfe6231330cddb6747 android.hardwar # ABI preserving changes to HALs released in Android O -28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types \ No newline at end of file +28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types + +# HALs released in Android O MR1 (Final Set) +0a159f81359cd4f71bbe00972ee8403ea79351fb7c0cd48be72ebb3e424dbaef android.hardware.radio@1.0::types 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 {