Snap for 11859356 from 6c4bc494ee086b790b4c6489127daf7c86ac3633 to 24Q3-release (bbc5db09) · Commits · e / os / android_hardware_interfaces

security/keymint/aidl/vts/functional/KeyMintTest.cpp

+0 −7

Original line number	Diff line number	Diff line
		@@ -8917,13 +8917,6 @@ TEST_F(InstanceTest, FeatureVersionInAidl) {
		using aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase;

		int main(int argc, char** argv) {
		std::cout << "Testing ";
		auto halInstances = KeyMintAidlTestBase::build_params();
		std::cout << "HAL instances:\n";
		for (auto& entry : halInstances) {
		std::cout << " " << entry << '\n';
		}

		::testing::InitGoogleTest(&argc, argv);
		for (int i = 1; i < argc; ++i) {
		if (argv[i][0] == '-') {

threadnetwork/aidl/default/main.cpp

+31 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,11 @@
		#include <android-base/logging.h>
		#include <android/binder_manager.h>
		#include <android/binder_process.h>
		#include <netinet/in.h>
		#include <net/if.h>
		#include <utils/Log.h>
		#include <cutils/properties.h>
		#include <sys/stat.h>

		#include "service.hpp"
		#include "thread_chip.hpp"
		@@ -26,6 +30,8 @@
		using aidl::android::hardware::threadnetwork::IThreadChip;
		using aidl::android::hardware::threadnetwork::ThreadChip;

		#define THREADNETWORK_COPROCESSOR_SIMULATION_PATH "/apex/com.android.hardware.threadnetwork/bin/ot-rcp"

		namespace {
		void addThreadChip(int id, const char* url) {
		binder_status_t status;
		@@ -41,15 +47,37 @@ void addThreadChip(int id, const char* url) {
		status = AServiceManager_addService(threadChip->asBinder().get(), serviceName.c_str());
		CHECK_EQ(status, STATUS_OK);
		}

		void addSimulatedThreadChip() {
		char local_interface[PROP_VALUE_MAX];

		CHECK_GT(property_get("persist.vendor.otsim.local_interface",
		local_interface, "eth1"), 0);

		int node_id = property_get_int32("ro.boot.openthread_node_id", 0);
		CHECK_GT(node_id,0);

		std::string url = std::string("spinel+hdlc+forkpty://" \
		THREADNETWORK_COPROCESSOR_SIMULATION_PATH "?forkpty-arg=-L") \
		+ local_interface + "&forkpty-arg=" + std::to_string(node_id);
		addThreadChip(0, url.c_str());
		}
		}

		int main(int argc, char* argv[]) {
		CHECK_GT(argc, 1);
		aidl::android::hardware::threadnetwork::Service service;

		if (argc > 1) {
		for (int id = 0; id < argc - 1; id++) {
		addThreadChip(id, argv[id + 1]);
		}
		} else {
		struct stat sb;

		CHECK_EQ(stat(THREADNETWORK_COPROCESSOR_SIMULATION_PATH, &sb), 0);
		CHECK(sb.st_mode & S_IXUSR);
		addSimulatedThreadChip();
		}

		ALOGI("Thread Network HAL is running");

threadnetwork/aidl/default/threadnetwork-service.rc

+1 −1

Original line number	Diff line number	Diff line
		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
		service vendor.threadnetwork_hal /apex/com.android.hardware.threadnetwork/bin/hw/android.hardware.threadnetwork-service
		class hal
		user thread_network