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

Commit c71ce54c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topic "am-aa23dce5dfef4eabb0d598df92a6d955" into... 

Merge changes from topic "am-aa23dce5dfef4eabb0d598df92a6d955" into rvc-d1-dev-plus-aosp am: d969b57d

Change-Id: I188fee7b35deb2f6d4286a44614433e8888201d2
parents ff97767b d969b57d

automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h

+2 −10
Original line number Diff line number Diff line
@@ -20,11 +20,7 @@ 


#include <android/hardware/automotive/vehicle/2.0/types.h>



namespace android {

namespace hardware {

namespace automotive {

namespace vehicle {

namespace V2_0 {

namespace android::hardware::automotive::vehicle::V2_0 {



/**

 *  Vehicle HAL talks to the vehicle through a client, instead of accessing
@@ -66,8 +62,4 @@ class IVehicleClient { 
    }

};



}  // namespace V2_0

}  // namespace vehicle

}  // namespace automotive

}  // namespace hardware

}  // namespace android
 
}  // namespace android::hardware::automotive::vehicle::V2_0

automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h

+2 −10
Original line number Diff line number Diff line
@@ -20,11 +20,7 @@ 


#include <android/hardware/automotive/vehicle/2.0/types.h>



namespace android {

namespace hardware {

namespace automotive {

namespace vehicle {

namespace V2_0 {

namespace android::hardware::automotive::vehicle::V2_0 {



/**

 *  Server lives on the vehicle side to talk to Android HAL.
@@ -69,8 +65,4 @@ class IVehicleServer { 
#endif  // __ANDROID__

};



}  // namespace V2_0

}  // namespace vehicle

}  // namespace automotive

}  // namespace hardware

}  // namespace android
 
}  // namespace android::hardware::automotive::vehicle::V2_0