Merge "Fix docstrings for RIL_CellIdentity" (e4d5502c) · Commits · e / os / android_hardware_interfaces

current.txt

+4 −1

Original line number	Diff line number	Diff line
		@@ -190,3 +190,6 @@ fe3c3c2f572b72f15f8594c538b0577bd5c28722c31879cfe6231330cddb6747 android.hardwar
		# ABI preserving changes to HALs released in Android O

		28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types

		# HALs released in Android O MR1 (Final Set)
		0a159f81359cd4f71bbe00972ee8403ea79351fb7c0cd48be72ebb3e424dbaef android.hardware.radio@1.0::types

+8 −8

Original line number	Diff line number	Diff line
		@@ -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 {