Merge changes from topic "rvc-dev-trout" into rvc-dev am: 7bb7ec3df4 (26c1a59b) · Commits · e / os / android_hardware_interfaces

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

+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