Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b1b325a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "sdv-vhal-emulator-service" into udc-qpr-dev-plus-aosp am: dfa4ae0d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24805466



Change-Id: I32b745bb733b52d6fd77c17fd584da5a6c073575
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b795b1d1 dfa4ae0d

automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.h

+4 −2
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ class GRPCVehicleHardware : public IVehicleHardware { 


    bool waitForConnected(std::chrono::milliseconds waitTime);



  protected:

    std::shared_mutex mCallbackMutex;

    std::unique_ptr<const PropertyChangeCallback> mOnPropChange;



  private:

    void ValuePollingLoop();
@@ -90,8 +94,6 @@ class GRPCVehicleHardware : public IVehicleHardware { 
    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;