Snap for 11853201 from 59e2a0804fd4eb70400bdf692c0827c53bf5c65f to 24Q3-release (80818fc4) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/aidl/impl/fake_impl/hardware/include/FakeVehicleHardware.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ class FakeVehicleHardware : public IVehicleHardware {
		std::unordered_set<int32_t> hvacPowerDependentProps;

		const bool mForceOverride;
		bool mAddExtraTestVendorConfigs;
		bool mAddExtraTestVendorConfigs = false;

		// Only used during initialization.
		JsonConfigLoader mLoader;

+9 −3

Original line number	Diff line number	Diff line
		@@ -188,10 +188,16 @@ class VtsRemotelyProvisionedComponentTests : public testing::TestWithParam<std::
		}
		ASSERT_NE(provisionable_, nullptr);
		auto status = provisionable_->getHardwareInfo(&rpcHardwareInfo);
		if (GetParam() == RKP_VM_INSTANCE_NAME &&
		status.getExceptionCode() == EX_UNSUPPORTED_OPERATION) {
		if (GetParam() == RKP_VM_INSTANCE_NAME) {
		if (status.getExceptionCode() == EX_UNSUPPORTED_OPERATION) {
		GTEST_SKIP() << "The RKP VM is not supported on this system.";
		}
		int apiLevel = get_vsr_api_level();
		if (apiLevel < __ANDROID_API_V__) {
		GTEST_SKIP() << "The RKP VM is supported only on V+ devices. Vendor API level: "
		<< apiLevel;
		}
		}
		ASSERT_TRUE(status.isOk());
		}

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		$(eval $(call declare-1p-copy-files,hardware/interfaces/tv,tuner_vts_config_1_0.xml))
		$(eval $(call declare-1p-copy-files,hardware/interfaces/tv,tuner_vts_config_1_1.xml))