Merge "Stats: Implement AIDL version of the HAL interface within StatsHal" into sc-dev (ec169127) · Commits · e / os / platform_frameworks_native

services/stats/Android.bp

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,11 +10,14 @@ package {
	cc_library_shared {		cc_library_shared {
	name: "libstatshidl",		name: "libstatshidl",
	srcs: [		srcs: [
			"StatsAidl.cpp",
	"StatsHal.cpp",		"StatsHal.cpp",
	],		],
	cflags: ["-Wall", "-Werror"],		cflags: ["-Wall", "-Werror"],
	shared_libs: [		shared_libs: [
	"android.frameworks.stats@1.0",		"android.frameworks.stats@1.0",
			"android.frameworks.stats-V1-ndk_platform",
			"libbinder_ndk",
	"libhidlbase",		"libhidlbase",
	"liblog",		"liblog",
	"libstatslog",		"libstatslog",
	@@ -24,6 +27,10 @@ cc_library_shared {
	export_include_dirs: [		export_include_dirs: [
	"include/",		"include/",
	],		],
			export_shared_lib_headers: [
			"android.frameworks.stats@1.0",
			"android.frameworks.stats-V1-ndk_platform",
			],
	local_include_dirs: [		local_include_dirs: [
	"include/stats",		"include/stats",
	],		],

services/stats/StatsAidl.cpp

0 → 100644

+79 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2021 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 DEBUG false // STOPSHIP if true
			#define LOG_TAG "StatsAidl"

			#include <log/log.h>
			#include <statslog.h>

			#include "StatsAidl.h"

			namespace aidl {
			namespace android {
			namespace frameworks {
			namespace stats {

			StatsHal::StatsHal() {}

			ndk::ScopedAStatus StatsHal::reportVendorAtom(const VendorAtom& vendorAtom) {
			std::string reverseDomainName = (std::string) vendorAtom.reverseDomainName;
			if (vendorAtom.atomId < 100000 \|\| vendorAtom.atomId >= 200000) {
			ALOGE("Atom ID %ld is not a valid vendor atom ID", (long) vendorAtom.atomId);
			return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(
			-1, "Not a valid vendor atom ID");
			}
			if (reverseDomainName.length() > 50) {
			ALOGE("Vendor atom reverse domain name %s is too long.", reverseDomainName.c_str());
			return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(
			-1, "Vendor atom reverse domain name is too long");
			}
			AStatsEvent* event = AStatsEvent_obtain();
			AStatsEvent_setAtomId(event, vendorAtom.atomId);
			AStatsEvent_writeString(event, vendorAtom.reverseDomainName.c_str());
			for (const auto& atomValue : vendorAtom.values) {
			switch (atomValue.getTag()) {
			case VendorAtomValue::intValue:
			AStatsEvent_writeInt32(event,
			atomValue.get<VendorAtomValue::intValue>());
			break;
			case VendorAtomValue::longValue:
			AStatsEvent_writeInt64(event,
			atomValue.get<VendorAtomValue::longValue>());
			break;
			case VendorAtomValue::floatValue:
			AStatsEvent_writeFloat(event,
			atomValue.get<VendorAtomValue::floatValue>());
			break;
			case VendorAtomValue::stringValue:
			AStatsEvent_writeString(event,
			atomValue.get<VendorAtomValue::stringValue>().c_str());
			break;
			}
			}
			AStatsEvent_build(event);
			const int ret = AStatsEvent_write(event);
			AStatsEvent_release(event);

			return ret <= 0 ?
			ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(ret, "report atom failed") :
			ndk::ScopedAStatus::ok();
			}

			} // namespace stats
			} // namespace frameworks
			} // namespace android
			} // namespace aidl

services/stats/android.frameworks.stats@1.0-service.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,4 +8,10 @@
	<instance>default</instance>		<instance>default</instance>
	</interface>		</interface>
	</hal>		</hal>

			<hal format="aidl">
			<name>android.frameworks.stats</name>
			<version>1</version>
			<fqname>IStats/default</fqname>
			</hal>
	</manifest>		</manifest>

services/stats/include/stats/StatsAidl.h

0 → 100644

+38 −0

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

			#include <aidl/android/frameworks/stats/BnStats.h>

			namespace aidl {
			namespace android {
			namespace frameworks {
			namespace stats {

			class StatsHal : public BnStats {
			public:
			StatsHal();

			/**
			* Binder call to get vendor atom.
			*/
			virtual ndk::ScopedAStatus reportVendorAtom(
			const VendorAtom& in_vendorAtom) override;
			};

			} // namespace stats
			} // namespace frameworks
			} // namespace android
			} // namespace aidl