tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I35f4860e,I4f02885b into main am: e2e4e54a0a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3096235

Change-Id: Ie659c0ee8001e931e45744b5edbd6cf9a647a526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Shan 2024-05-24 23:18:52 +00:00 committed by Automerger Merge Worker
commit 7502bc52b8
9 changed files with 133 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.cpp
View file

@ -206,6 +206,25 @@ aidlvhal::StatusCode GRPCVehicleHardware::subscribe(aidlvhal::SubscribeOptions o
return static_cast<aidlvhal::StatusCode>(protoStatus.status_code());
}
aidlvhal::StatusCode GRPCVehicleHardware::unsubscribe(int32_t propId, int32_t areaId) {
proto::UnsubscribeRequest request;
::grpc::ClientContext context;
proto::VehicleHalCallStatus protoStatus;
request.set_prop_id(propId);
request.set_area_id(areaId);
auto grpc_status = mGrpcStub->Unsubscribe(&context, request, &protoStatus);
if (!grpc_status.ok()) {
if (grpc_status.error_code() == ::grpc::StatusCode::UNIMPLEMENTED) {
// This is a legacy sever. Ignore unsubscribe request.
LOG(INFO) << __func__ << ": GRPC Unsubscribe is not supported by the server";
return aidlvhal::StatusCode::OK;
}
LOG(ERROR) << __func__ << ": GRPC Unsubscribe Failed: " << grpc_status.error_message();
return aidlvhal::StatusCode::INTERNAL_ERROR;
}
return static_cast<aidlvhal::StatusCode>(protoStatus.status_code());
}
aidlvhal::StatusCode GRPCVehicleHardware::updateSampleRate(int32_t propId, int32_t areaId,
float sampleRate) {
::grpc::ClientContext context;

2
automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.h
View file

@ -85,6 +85,8 @@ class GRPCVehicleHardware : public IVehicleHardware {
aidlvhal::StatusCode subscribe(aidlvhal::SubscribeOptions options) override;
aidlvhal::StatusCode unsubscribe(int32_t propId, int32_t areaId) override;
bool waitForConnected(std::chrono::milliseconds waitTime);
protected:

10
automotive/vehicle/aidl/impl/grpc/GRPCVehicleProxyServer.cpp
View file

@ -175,6 +175,16 @@ GrpcVehicleProxyServer::GrpcVehicleProxyServer(std::string serverAddr,
return ::grpc::Status::OK;
}
::grpc::Status GrpcVehicleProxyServer::Unsubscribe(::grpc::ServerContext* context,
const proto::UnsubscribeRequest* request,
proto::VehicleHalCallStatus* status) {
int32_t propId = request->prop_id();
int32_t areaId = request->area_id();
const auto status_code = mHardware->unsubscribe(propId, areaId);
status->set_status_code(static_cast<proto::StatusCode>(status_code));
return ::grpc::Status::OK;
}
::grpc::Status GrpcVehicleProxyServer::CheckHealth(::grpc::ServerContext* context,
const ::google::protobuf::Empty*,
proto::VehicleHalCallStatus* status) {

4
automotive/vehicle/aidl/impl/grpc/GRPCVehicleProxyServer.h
View file

@ -60,6 +60,10 @@ class GrpcVehicleProxyServer : public proto::VehicleServer::Service {
::grpc::Status Subscribe(::grpc::ServerContext* context, const proto::SubscribeRequest* request,
proto::VehicleHalCallStatus* status) override;
::grpc::Status Unsubscribe(::grpc::ServerContext* context,
const proto::UnsubscribeRequest* request,
proto::VehicleHalCallStatus* status) override;
::grpc::Status CheckHealth(::grpc::ServerContext* context, const ::google::protobuf::Empty*,
proto::VehicleHalCallStatus* status) override;

3
automotive/vehicle/aidl/impl/grpc/proto/VehicleServer.proto
View file

@ -22,6 +22,7 @@ import "android/hardware/automotive/vehicle/DumpOptions.proto";
import "android/hardware/automotive/vehicle/DumpResult.proto";
import "android/hardware/automotive/vehicle/SubscribeRequest.proto";
import "android/hardware/automotive/vehicle/StatusCode.proto";
import "android/hardware/automotive/vehicle/UnsubscribeRequest.proto";
import "android/hardware/automotive/vehicle/VehiclePropConfig.proto";
import "android/hardware/automotive/vehicle/VehiclePropValue.proto";
import "android/hardware/automotive/vehicle/VehiclePropValueRequest.proto";
@ -43,4 +44,6 @@ service VehicleServer {
rpc StartPropertyValuesStream(google.protobuf.Empty) returns (stream VehiclePropValues) {}
rpc Subscribe(SubscribeRequest) returns (VehicleHalCallStatus) {}
rpc Unsubscribe(UnsubscribeRequest) returns (VehicleHalCallStatus) {}
}

51
automotive/vehicle/aidl/impl/grpc/test/GRPCVehicleHardwareUnitTest.cpp
View file

@ -151,7 +151,7 @@ TEST_F(GRPCVehicleHardwareMockServerUnitTest, SubscribeLegacyServer) {
EXPECT_CALL(*mGrpcStub, Subscribe(_, _, _))
.WillOnce(Return(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")));
aidlvhal::SubscribeOptions options; // Your options here (consider adding sample data)
aidlvhal::SubscribeOptions options;
auto status = mHardware->subscribe(options);
EXPECT_EQ(status, aidlvhal::StatusCode::OK);
@ -181,4 +181,53 @@ TEST_F(GRPCVehicleHardwareMockServerUnitTest, SubscribeProtoFailure) {
EXPECT_EQ(status, aidlvhal::StatusCode::NOT_AVAILABLE_SPEED_LOW);
}
TEST_F(GRPCVehicleHardwareMockServerUnitTest, Unsubscribe) {
proto::VehicleHalCallStatus protoStatus;
protoStatus.set_status_code(proto::StatusCode::OK);
proto::UnsubscribeRequest actualRequest;
EXPECT_CALL(*mGrpcStub, Unsubscribe(_, _, _))
.WillOnce(DoAll(SaveArg<1>(&actualRequest), SetArgPointee<2>(protoStatus),
Return(::grpc::Status::OK)));
int32_t propId = 1;
int32_t areaId = 2;
auto status = mHardware->unsubscribe(propId, areaId);
EXPECT_EQ(status, aidlvhal::StatusCode::OK);
EXPECT_EQ(actualRequest.prop_id(), propId);
EXPECT_EQ(actualRequest.area_id(), areaId);
}
TEST_F(GRPCVehicleHardwareMockServerUnitTest, UnsubscribeLegacyServer) {
EXPECT_CALL(*mGrpcStub, Unsubscribe(_, _, _))
.WillOnce(Return(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")));
auto status = mHardware->unsubscribe(1, 2);
EXPECT_EQ(status, aidlvhal::StatusCode::OK);
}
TEST_F(GRPCVehicleHardwareMockServerUnitTest, UnsubscribeGrpcFailure) {
EXPECT_CALL(*mGrpcStub, Unsubscribe(_, _, _))
.WillOnce(Return(::grpc::Status(::grpc::StatusCode::INTERNAL, "GRPC Error")));
auto status = mHardware->unsubscribe(1, 2);
EXPECT_EQ(status, aidlvhal::StatusCode::INTERNAL_ERROR);
}
TEST_F(GRPCVehicleHardwareMockServerUnitTest, UnsubscribeProtoFailure) {
proto::VehicleHalCallStatus protoStatus;
protoStatus.set_status_code(proto::StatusCode::NOT_AVAILABLE_SPEED_LOW);
EXPECT_CALL(*mGrpcStub, Unsubscribe(_, _, _))
.WillOnce(DoAll(SetArgPointee<2>(protoStatus), // Set the output status
Return(::grpc::Status::OK)));
auto status = mHardware->unsubscribe(1, 2);
EXPECT_EQ(status, aidlvhal::StatusCode::NOT_AVAILABLE_SPEED_LOW);
}
} // namespace android::hardware::automotive::vehicle::virtualization

19
automotive/vehicle/aidl/impl/grpc/test/GRPCVehicleProxyServerUnitTest.cpp
View file

@ -219,4 +219,23 @@ TEST(GRPCVehicleProxyServerUnitTest, SubscribeNotAvailable) {
EXPECT_EQ(returnStatus.status_code(), proto::StatusCode::NOT_AVAILABLE);
}
TEST(GRPCVehicleProxyServerUnitTest, Unsubscribe) {
auto mockHardware = std::make_unique<MockVehicleHardware>();
// We make sure this is alive inside the function scope.
MockVehicleHardware* mockHardwarePtr = mockHardware.get();
GrpcVehicleProxyServer server = GrpcVehicleProxyServer("", std::move(mockHardware));
::grpc::ServerContext context;
proto::UnsubscribeRequest request;
proto::VehicleHalCallStatus returnStatus;
request.set_prop_id(1);
request.set_area_id(2);
EXPECT_CALL(*mockHardwarePtr, unsubscribe(1, 2)).WillOnce(Return(aidlvhal::StatusCode::OK));
auto grpcStatus = server.Unsubscribe(&context, &request, &returnStatus);
EXPECT_TRUE(grpcStatus.ok());
EXPECT_EQ(returnStatus.status_code(), proto::StatusCode::OK);
}
} // namespace android::hardware::automotive::vehicle::virtualization

2
automotive/vehicle/aidl/impl/proto/Android.bp
View file

@ -52,6 +52,7 @@ genrule {
"android/hardware/automotive/vehicle/VehiclePropValueRequest.pb.h",
"android/hardware/automotive/vehicle/SubscribeOptions.pb.h",
"android/hardware/automotive/vehicle/SubscribeRequest.pb.h",
"android/hardware/automotive/vehicle/UnsubscribeRequest.pb.h",
],
}
@ -78,6 +79,7 @@ genrule {
"android/hardware/automotive/vehicle/VehiclePropValueRequest.pb.cc",
"android/hardware/automotive/vehicle/SubscribeOptions.pb.cc",
"android/hardware/automotive/vehicle/SubscribeRequest.pb.cc",
"android/hardware/automotive/vehicle/UnsubscribeRequest.pb.cc",
],
}

24
automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/UnsubscribeRequest.proto Normal file
View file

@ -0,0 +1,24 @@
/*
* Copyright (C) 2024 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.
*/
syntax = "proto3";
package android.hardware.automotive.vehicle.proto;
message UnsubscribeRequest {
int32 prop_id = 1;
int32 area_id = 2;
}