| commit | 2b1b325a06530bb7929609a85f5f2a26e501bbcc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat Sep 23 23:18:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 23 23:18:53 2023 +0000 |
| tree | e4cfc85b41842290219e14d70ce63fb8f7599ff4 | |
| parent | b795b1d1f82ae7ca0bb8e4bf938a1fb7559a8bd2 [diff] | |
| parent | dfa4ae0d285e03654bda5c6708847c38bd4d6096 [diff] |
Merge changes from topic "sdv-vhal-emulator-service" into udc-qpr-dev-plus-aosp am: dfa4ae0d28 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24805466 Change-Id: I32b745bb733b52d6fd77c17fd584da5a6c073575 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.h b/automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.h index e740da7..ddd620e 100644 --- a/automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.h +++ b/automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.h
@@ -82,6 +82,10 @@ bool waitForConnected(std::chrono::milliseconds waitTime); + protected: + std::shared_mutex mCallbackMutex; + std::unique_ptr<const PropertyChangeCallback> mOnPropChange; + private: void ValuePollingLoop(); @@ -90,8 +94,6 @@ std::unique_ptr<proto::VehicleServer::Stub> mGrpcStub; std::thread mValuePollingThread; - std::shared_mutex mCallbackMutex; - std::unique_ptr<const PropertyChangeCallback> mOnPropChange; std::unique_ptr<const PropertySetErrorCallback> mOnSetErr; std::mutex mShutdownMutex;