Merge "Remove GnssHidlHal from default implementation" into tm-dev (4bd6c41d) · Commits · e / os / android_hardware_interfaces

gnss/aidl/default/Android.bp

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,6 @@ cc_binary {
	],		],
	vintf_fragments: [		vintf_fragments: [
	"gnss-default.xml",		"gnss-default.xml",
	"gnss@2.1-service.xml",
	],		],
	vendor: true,		vendor: true,
	cflags: [		cflags: [
	@@ -47,7 +46,6 @@ cc_binary {
	"liblog",		"liblog",
	"android.hardware.gnss@2.1",		"android.hardware.gnss@2.1",
	"android.hardware.gnss@2.0",		"android.hardware.gnss@2.0",
	"android.hardware.gnss@1.1",
	"android.hardware.gnss@1.0",		"android.hardware.gnss@1.0",
	"android.hardware.gnss.measurement_corrections@1.1",		"android.hardware.gnss.measurement_corrections@1.1",
	"android.hardware.gnss.measurement_corrections@1.0",		"android.hardware.gnss.measurement_corrections@1.0",
	@@ -62,7 +60,6 @@ cc_binary {
	"GnssBatching.cpp",		"GnssBatching.cpp",
	"GnssDebug.cpp",		"GnssDebug.cpp",
	"GnssGeofence.cpp",		"GnssGeofence.cpp",
	"GnssHidlHal.cpp",
	"GnssNavigationMessageInterface.cpp",		"GnssNavigationMessageInterface.cpp",
	"GnssPowerIndication.cpp",		"GnssPowerIndication.cpp",
	"GnssPsds.cpp",		"GnssPsds.cpp",

gnss/aidl/default/GnssHidlHal.cpp

deleted100644 → 0

+0 −65

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2020 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.
	*/

	#define LOG_TAG "GnssHidlHal"

	#include "GnssHidlHal.h"

	namespace aidl::android::hardware::gnss {

	using GnssSvInfo = ::android::hardware::gnss::V2_1::IGnssCallback::GnssSvInfo;

	GnssHidlHal::GnssHidlHal(const std::shared_ptr<Gnss>& gnssAidl) : mGnssAidl(gnssAidl) {
	Gnss* iGnss = mGnssAidl.get();
	std::shared_ptr<IGnssConfiguration> iGnssConfiguration;
	auto status = iGnss->getExtensionGnssConfiguration(&iGnssConfiguration);
	if (!status.isOk()) {
	ALOGE("Failed to getExtensionGnssConfiguration.");
	} else {
	mGnssConfigurationAidl = iGnss->mGnssConfiguration;
	}

	std::shared_ptr<IGnssPowerIndication> iGnssPowerIndication;
	status = iGnss->getExtensionGnssPowerIndication(&iGnssPowerIndication);
	if (!status.isOk()) {
	ALOGE("Failed to getExtensionGnssPowerIndication.");
	} else {
	mGnssPowerIndicationAidl = iGnss->mGnssPowerIndication;
	}
	};

	hidl_vec<GnssSvInfo> GnssHidlHal::filterBlocklistedSatellitesV2_1(
	hidl_vec<GnssSvInfo> gnssSvInfoList) {
	if (mGnssConfigurationAidl == nullptr) {
	ALOGE("Handle to AIDL GnssConfiguration is not available.");
	return gnssSvInfoList;
	}
	for (uint32_t i = 0; i < gnssSvInfoList.size(); i++) {
	if (mGnssConfigurationAidl->isBlocklistedV2_1(gnssSvInfoList[i])) {
	ALOGD("Blocklisted constellation: %d, svid: %d",
	(int)gnssSvInfoList[i].v2_0.constellation, gnssSvInfoList[i].v2_0.v1_0.svid);
	gnssSvInfoList[i].v2_0.v1_0.svFlag &= ~static_cast<uint8_t>(
	::android::hardware::gnss::V1_0::IGnssCallback::GnssSvFlags::USED_IN_FIX);
	}
	}
	return gnssSvInfoList;
	}

	void GnssHidlHal::notePowerConsumption() {
	mGnssPowerIndicationAidl->notePowerConsumption();
	}

	} // namespace aidl::android::hardware::gnss

gnss/aidl/default/GnssHidlHal.h

deleted100644 → 0

+0 −42

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2020 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.
	*/

	#pragma once

	#include "Gnss.h"
	#include "GnssConfiguration.h"
	#include "v2_1/GnssTemplate.h"

	namespace aidl::android::hardware::gnss {

	class GnssHidlHal : public ::android::hardware::gnss::common::implementation::GnssTemplate<
	::android::hardware::gnss::V2_1::IGnss> {
	public:
	GnssHidlHal(const std::shared_ptr<Gnss>& gnssAidl);

	private:
	hidl_vec<::android::hardware::gnss::V2_1::IGnssCallback::GnssSvInfo>
	filterBlocklistedSatellitesV2_1(
	hidl_vec<::android::hardware::gnss::V2_1::IGnssCallback::GnssSvInfo> gnssSvInfoList)
	override;
	void notePowerConsumption() override;

	std::shared_ptr<Gnss> mGnssAidl;
	std::shared_ptr<GnssConfiguration> mGnssConfigurationAidl;
	std::shared_ptr<GnssPowerIndication> mGnssPowerIndicationAidl;
	};

	} // namespace aidl::android::hardware::gnss

gnss/aidl/default/gnss@2.1-service.xml

deleted100644 → 0

+0 −12

Original line number	Original line	Diff line number	Diff line
	<manifest version="1.0" type="device">
	<hal format="hidl">
	<name>android.hardware.gnss</name>
	<transport>hwbinder</transport>
	<version>2.1</version>
	<version>1.1</version>
	<interface>
	<name>IGnss</name>
	<instance>default</instance>
	</interface>
	</hal>
	</manifest>

gnss/aidl/default/service.cpp

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -24,15 +24,12 @@
	#include <log/log.h>		#include <log/log.h>
	#include <pthread.h>		#include <pthread.h>
	#include "Gnss.h"		#include "Gnss.h"
	#include "GnssHidlHal.h"

	using aidl::android::hardware::gnss::Gnss;		using aidl::android::hardware::gnss::Gnss;
	using aidl::android::hardware::gnss::GnssHidlHal;
	using ::android::OK;		using ::android::OK;
	using ::android::sp;		using ::android::sp;
	using ::android::hardware::configureRpcThreadpool;		using ::android::hardware::configureRpcThreadpool;
	using ::android::hardware::joinRpcThreadpool;		using ::android::hardware::joinRpcThreadpool;
	using ::android::hardware::gnss::V2_1::IGnss;

	int main() {		int main() {
	ABinderProcess_setThreadPoolMaxThreadCount(1);		ABinderProcess_setThreadPoolMaxThreadCount(1);
	@@ -44,14 +41,6 @@ int main() {
	AServiceManager_addService(gnssAidl->asBinder().get(), instance.c_str());		AServiceManager_addService(gnssAidl->asBinder().get(), instance.c_str());
	CHECK_EQ(status, STATUS_OK);		CHECK_EQ(status, STATUS_OK);

	sp<IGnss> gnss = new GnssHidlHal(gnssAidl);
	configureRpcThreadpool(1, true /* will join */);
	if (gnss->registerAsService() != OK) {
	ALOGE("Could not register gnss 2.1 service.");
	return 0;
	}

	joinRpcThreadpool();
	ABinderProcess_joinThreadPool();		ABinderProcess_joinThreadPool();

	return EXIT_FAILURE; // should not reach		return EXIT_FAILURE; // should not reach