Merge "Fix failing VTS test cases" into oc-dev am: d77a4a5585 (a4e82724) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/2.0/default/VehicleService.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ int main(int /* argc /, char /* argv */ []) {
		auto emulator = std::make_unique<impl::VehicleEmulator>(hal.get());
		auto service = std::make_unique<VehicleHalManager>(hal.get());

		configureRpcThreadpool(1, true /* callerWillJoin */);
		configureRpcThreadpool(4, true /* callerWillJoin */);

		ALOGI("Registering as service...");
		service->registerAsService();

+5 −1

Original line number	Diff line number	Diff line
		@@ -77,6 +77,8 @@ const ConfigDeclaration kVehicleProperties[] {
		.prop = toInt(VehicleProperty::PERF_VEHICLE_SPEED),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.minSampleRate = 1.0f,
		.maxSampleRate = 1000.0f,
		},
		.initialValue = { .floatValues = {0.0f} }
		},
		@@ -95,8 +97,10 @@ const ConfigDeclaration kVehicleProperties[] {
		.prop = toInt(VehicleProperty::ENGINE_RPM),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::CONTINUOUS,
		.minSampleRate = 1.0f,
		.maxSampleRate = 1000.0f,
		},
		.initialValue = { .floatValues = {0.0f} }
		.initialValue = { .floatValues = {0.0f} },
		},

		{

+1 −2

Original line number	Diff line number	Diff line
		@@ -52,8 +52,7 @@ public:
		protected:
		VehicleEmulator* getEmulatorOrDie() {
		std::lock_guard<std::mutex> g(mEmulatorLock);
		ALOGI("%s, emulator: %p", __func__, mEmulator);
		assert(mEmulator != nullptr);
		if (mEmulator == nullptr) abort();
		return mEmulator;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ const V2_0::VehiclePropConfig kVehicleProperties[] = {
		.prop = WHEEL_TICK,
		.access = V2_0::VehiclePropertyAccess::READ,
		.changeMode = V2_0::VehiclePropertyChangeMode::CONTINUOUS,
		.minSampleRate = 1.0f,
		.maxSampleRate = 100.0f,
		},

		{