Merge "Add IRNSS to GnssConstellationType (HAL)" (b3e29358) · Commits · e / os / android_hardware_interfaces

current.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -464,12 +464,13 @@ f27baaa587bc3dd9b740cb6928ab812b9b7d105b5187663938aee578105f3c39 android.hardwar
		7f460e795f5d1ed5e378935f98c6db4d39497de988aef1b4c2a4a07a6c400392 android.hardware.gnss@2.0::IAGnss
		2e5ad983734069e84a760004b32da0d09e4170c05380abe27e6eb80e4aa70d5a android.hardware.gnss@2.0::IAGnssCallback
		1f4ac068a88a72360280d94a7f6fd7c63813c1eea4891a0eb01394d3e7e775f2 android.hardware.gnss@2.0::IAGnssRil
		6e2f9a44375a0ae0b49ca7d711cb88945189d398535078408269e1e85889061d android.hardware.gnss@2.0::IGnss
		782dfc724272f279985de348c824197357941382f73c0083f0344d8ec594d2a8 android.hardware.gnss@2.0::IGnssCallback
		63216fcb23eaf4d6f12ea0e99b8bfdb8e4e57c02f215d433cd30943d850f61a7 android.hardware.gnss@2.0::IGnss
		b11a5e4a1602d3f408716b6fe2c578a79f060d571aad8e828f9a4426d161fbcf android.hardware.gnss@2.0::IGnssCallback
		ecc966c68bddbd95c8dae782b84204cf01c75734675e8769963f3b5106ec128b android.hardware.gnss@2.0::IGnssConfiguration
		b670bae2ab8517336290532e364502b4db9120340d75474ccc8442b1b15d6ab7 android.hardware.gnss@2.0::IGnssDebug
		c67759f5d6387d273b66729180d03690e827f0b6b8d4e13ce2ff42d31b224065 android.hardware.gnss@2.0::IGnssMeasurement
		3dd30a3ca77ef5ab109a55ba603ff816ae5019436886093dccf8fd6a068f85f1 android.hardware.gnss@2.0::IGnssMeasurementCallback
		4bcd767dd05304b4722c6521c7ed8d4a05faf6022f228f2c088379c647871f7c android.hardware.gnss@2.0::types
		15e09903748857f4beb5f485784606931fa5a6277cd070baa6d584df485b7948 android.hardware.gnss@2.0::IGnssMeasurementCallback
		a49c973f21ddf41bc402de55d7c8dffacf4dce06b0bbca4f5ffd3b09a471317e android.hardware.gnss@2.0::types
		d4cc8d91930d5a1a62deb0d97d398510a115ce3ede2d2978738651b9d01b11c3 android.hardware.gnss.measurement_corrections@1.0::IMeasurementCorrections
		3eec9763db9b101644f14175b77c9954047445a468e9c743fd402d472d4aa97e android.hardware.gnss.measurement_corrections@1.0::IMeasurementCorrectionsCallback
		6ef12cd95df73f8f80c25eb035d98ca4594f9cee571fdabea838a0b6016dd908 android.hardware.gnss.measurement_corrections@1.0::types

gnss/2.0/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ hidl_interface {
		"IGnss.hal",
		"IGnssCallback.hal",
		"IGnssConfiguration.hal",
		"IGnssDebug.hal",
		"IGnssMeasurement.hal",
		"IGnssMeasurementCallback.hal",
		],

gnss/2.0/IGnss.hal

+8 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import @1.1::IGnss;
		import GnssLocation;
		import IGnssCallback;
		import IGnssConfiguration;
		import IGnssDebug;
		import IGnssMeasurement;
		import IAGnss;
		import IAGnssRil;
		@@ -54,6 +55,13 @@ interface IGnss extends @1.1::IGnss {
		*/
		getExtensionGnssConfiguration_2_0() generates (IGnssConfiguration gnssConfigurationIface);

		/**
		* This method returns the IGnssDebug interface.
		*
		* @return gnssDebugIface Handle to the IGnssDebug interface.
		*/
		getExtensionGnssDebug_2_0() generates (IGnssDebug gnssDebugIface);

		/**
		* This method returns the IAGnss Interface.
		*

gnss/2.0/IGnssCallback.hal

+23 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.hardware.gnss@2.0;
		import @1.0::IGnssCallback;
		import @1.1::IGnssCallback;
		import GnssLocation;
		import GnssConstellationType;

		/**
		* This interface is required for the HAL to communicate certain information
		@@ -94,4 +95,26 @@ interface IGnssCallback extends @1.1::IGnssCallback {
		* during-call to E911, or up to 5 minutes after end-of-call or text to E911).
		*/
		gnssRequestLocationCb_2_0(bool independentFromGnss, bool isUserEmergency);

		/** Extends a GnssSvInfo, replacing the GnssConstellationType. */
		struct GnssSvInfo {
		/**
		* GNSS satellite information for a single satellite and frequency.
		*
		* In this version of the HAL, the field 'constellation' in the v1_0 struct is deprecated,
		* and is no longer used by the framework. The constellation type is instead reported in
		* @2.0::IGnssCallback.GnssSvInfo.constellation.
		*/
		@1.0::IGnssCallback.GnssSvInfo v1_0;

		/** Defines the constellation of the given SV. */
		GnssConstellationType constellation;
		};

		/**
		* Callback for the HAL to pass a vector of GnssSvInfo back to the client.
		*
		* @param svInfo SV status information from HAL.
		*/
		gnssSvStatusCb_2_0(vec<GnssSvInfo> svInfoList);
		};

gnss/2.0/IGnssDebug.hal

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.gnss@2.0;

		import @1.0::IGnssDebug;

		/** Extended interface for DEBUG support. */
		interface IGnssDebug extends @1.0::IGnssDebug {

		/** Extending SatelliteData, replacing the GnssConstellationType. */
		struct SatelliteData {
		/**
		* GNSS Satellite info.
		*
		* In this version of the HAL, the field 'constellation' in the v1_0 struct is deprecated,
		* and is no longer used by the framework. The constellation type is instead reported in
		* @2.0::IGnssDebug.SatelliteData.constellation.
		*/
		@1.0::IGnssDebug.SatelliteData v1_0;

		/** Defines the constellation type of the given SV. */
		GnssConstellationType constellation;
		};

		/**
		* Provides a set of debug information that is filled by the GNSS chipset when the method
		* getDebugData() is invoked.
		*/
		struct DebugData {
		/** Current best known position. */
		@1.0::IGnssDebug.PositionDebug position;

		/** Current best know time estimate. */
		@1.0::IGnssDebug.TimeDebug time;

		/**
		* Provides a list of the available satellite data, for all
		* satellites and constellations the device can track,
		* including GnssConstellationType UNKNOWN.
		*/
		vec<SatelliteData> satelliteDataArray;
		};

		/**
		* This methods requests position, time and satellite ephemeris debug information from the HAL.
		*
		* @return ret debugData information from GNSS Hal that contains the current best known
		* position, best known time estimate and a complete list of constellations that the device can
		* track.
		*/
		getDebugData_2_0() generates (DebugData debugData);
		};