Snap for 12185670 from 9cc88f0d0451ba2ddeb851b289fe83c958c66cf5 to 24Q4-release (41d351bf) · Commits · e / os / android_hardware_interfaces

health/utils/libhealthloop/HealthLoop.cpp

+3 −8

Original line number	Diff line number	Diff line
		@@ -20,20 +20,15 @@
		#include <health/HealthLoop.h>

		#include <errno.h>
		#include <libgen.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <string.h>
		#include <sys/epoll.h>
		#include <sys/epoll.h> // epoll_create1(), epoll_ctl(), epoll_wait()
		#include <sys/timerfd.h>
		#include <unistd.h>
		#include <unistd.h> // read()

		#include <android-base/logging.h>
		#include <batteryservice/BatteryService.h>
		#include <cutils/klog.h>
		#include <cutils/klog.h> // KLOG_*()
		#include <cutils/uevent.h>
		#include <healthd/healthd.h>
		#include <utils/Errors.h>

		#include <health/utils.h>

threadnetwork/aidl/default/Android.bp

+30 −2

Original line number	Diff line number	Diff line
		@@ -90,10 +90,20 @@ prebuilt_etc {
		installable: false,
		}

		filegroup {
		name: "com.android.hardware.threadnetwork_manifest",
		srcs: ["manifest.json"],
		}

		filegroup {
		name: "com.android.hardware.threadnetwork_file_contexts",
		srcs: ["file_contexts"],
		}

		apex {
		name: "com.android.hardware.threadnetwork",
		manifest: "manifest.json",
		file_contexts: "file_contexts",
		manifest: ":com.android.hardware.threadnetwork_manifest",
		file_contexts: ":com.android.hardware.threadnetwork_file_contexts",
		key: "com.android.hardware.key",
		certificate: ":com.android.hardware.certificate",
		updatable: false,
		@@ -110,3 +120,21 @@ apex {
		"android.hardware.thread_network.prebuilt.xml", // permission
		],
		}

		prebuilt_etc {
		name: "threadnetwork-service-simulation-rcp.rc",
		src: "threadnetwork-service-simulation-rcp.rc",
		installable: false,
		}

		// Thread HAL service which uses a simulation RCP (i.e. ot-rcp),
		// typically used in emulator devices.
		override_apex {
		name: "com.android.hardware.threadnetwork-simulation-rcp",
		base: "com.android.hardware.threadnetwork",
		prebuilts: [
		"threadnetwork-service-simulation-rcp.rc",
		"threadnetwork-default.xml",
		"android.hardware.thread_network.prebuilt.xml",
		],
		}

threadnetwork/aidl/default/threadnetwork-service-simulation-rcp.rc

0 → 100644

+3 −0

service vendor.threadnetwork_hal /apex/com.android.hardware.threadnetwork/bin/hw/android.hardware.threadnetwork-service spinel+hdlc+forkpty:///apex/com.android.hardware.threadnetwork/bin/ot-rcp?forkpty-arg=1

    class hal

    user thread_network