Merge changes from topic "am-aa23dce5dfef4eabb0d598df92a6d955" into rvc-d1-dev-plus-aosp am: d969b57d54
Change-Id: I188fee7b35deb2f6d4286a44614433e8888201d2
diff --git a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h
index 1e2f3ad..5e4bf27 100644
--- a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h
@@ -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 @@
}
};
-} // namespace V2_0
-} // namespace vehicle
-} // namespace automotive
-} // namespace hardware
-} // namespace android
+} // namespace android::hardware::automotive::vehicle::V2_0
diff --git a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h
index 27ebbee..ba9799a 100644
--- a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h
@@ -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 @@
#endif // __ANDROID__
};
-} // namespace V2_0
-} // namespace vehicle
-} // namespace automotive
-} // namespace hardware
-} // namespace android
+} // namespace android::hardware::automotive::vehicle::V2_0