From 4247384b4dd4c7681d8cd88c2f2b4c374b887723 Mon Sep 17 00:00:00 2001 From: Yu Shan Date: Thu, 5 Jan 2023 17:29:21 -0800 Subject: [PATCH] Split VHAL property into a separate AIDL interface. Split VHAL property definitions and enums out from the VHAL interface so that we can update the property separatly. This allows us to backport new property definition to older releases more easily. Test: Manual build Bug: 264600792 Change-Id: I6040a1d4d7832a970a5ad5e5a28c359b15b402fb --- automotive/vehicle/Android.bp | 1 + automotive/vehicle/aidl/Android.bp | 2 +- .../1/.hash | 1 + automotive/vehicle/aidl/aidl_test/Android.bp | 1 + automotive/vehicle/aidl_property/Android.bp | 53 +++++++++++++++++++ .../1/.hash | 2 + .../automotive/vehicle/CreateUserRequest.aidl | 0 .../vehicle/CreateUserResponse.aidl | 0 .../automotive/vehicle/CreateUserStatus.aidl | 0 .../automotive/vehicle/CustomInputType.aidl | 0 .../vehicle/DiagnosticFloatSensorIndex.aidl | 0 .../vehicle/DiagnosticIntegerSensorIndex.aidl | 0 .../ElectronicTollCollectionCardStatus.aidl | 0 .../ElectronicTollCollectionCardType.aidl | 0 .../automotive/vehicle/EvChargeState.aidl | 0 .../automotive/vehicle/EvConnectorType.aidl | 0 .../vehicle/EvRegenerativeBrakingState.aidl | 0 .../vehicle/EvsServiceRequestIndex.aidl | 0 .../automotive/vehicle/EvsServiceState.aidl | 0 .../automotive/vehicle/EvsServiceType.aidl | 0 .../hardware/automotive/vehicle/FuelType.aidl | 0 .../vehicle/InitialUserInfoRequest.aidl | 0 .../vehicle/InitialUserInfoRequestType.aidl | 0 .../vehicle/InitialUserInfoResponse.aidl | 0 .../InitialUserInfoResponseAction.aidl | 0 .../vehicle/Obd2CommonIgnitionMonitors.aidl | 0 .../Obd2CompressionIgnitionMonitors.aidl | 0 .../vehicle/Obd2FuelSystemStatus.aidl | 0 .../automotive/vehicle/Obd2FuelType.aidl | 0 .../vehicle/Obd2IgnitionMonitorKind.aidl | 0 .../vehicle/Obd2SecondaryAirStatus.aidl | 0 .../vehicle/Obd2SparkIgnitionMonitors.aidl | 0 .../automotive/vehicle/PortLocationType.aidl | 0 .../vehicle/ProcessTerminationReason.aidl | 0 .../automotive/vehicle/RemoveUserRequest.aidl | 0 .../automotive/vehicle/RotaryInputType.aidl | 0 .../vehicle/SwitchUserMessageType.aidl | 0 .../automotive/vehicle/SwitchUserRequest.aidl | 0 .../vehicle/SwitchUserResponse.aidl | 0 .../automotive/vehicle/SwitchUserStatus.aidl | 0 .../automotive/vehicle/TrailerState.aidl | 0 .../UserIdentificationAssociation.aidl | 0 ...UserIdentificationAssociationSetValue.aidl | 0 .../UserIdentificationAssociationType.aidl | 0 .../UserIdentificationAssociationValue.aidl | 0 .../vehicle/UserIdentificationGetRequest.aidl | 0 .../vehicle/UserIdentificationResponse.aidl | 0 .../UserIdentificationSetAssociation.aidl | 0 .../vehicle/UserIdentificationSetRequest.aidl | 0 .../hardware/automotive/vehicle/UserInfo.aidl | 0 .../automotive/vehicle/UsersInfo.aidl | 0 .../VehicleApPowerStateConfigFlag.aidl | 0 .../vehicle/VehicleApPowerStateReport.aidl | 0 .../vehicle/VehicleApPowerStateReq.aidl | 0 .../vehicle/VehicleApPowerStateReqIndex.aidl | 0 .../VehicleApPowerStateShutdownParam.aidl | 0 .../automotive/vehicle/VehicleArea.aidl | 0 .../automotive/vehicle/VehicleAreaDoor.aidl | 0 .../automotive/vehicle/VehicleAreaMirror.aidl | 0 .../automotive/vehicle/VehicleAreaSeat.aidl | 0 .../automotive/vehicle/VehicleAreaWheel.aidl | 0 .../automotive/vehicle/VehicleAreaWindow.aidl | 0 .../automotive/vehicle/VehicleDisplay.aidl | 0 .../automotive/vehicle/VehicleGear.aidl | 0 .../vehicle/VehicleHvacFanDirection.aidl | 0 .../vehicle/VehicleHwKeyInputAction.aidl | 0 .../vehicle/VehicleIgnitionState.aidl | 0 .../automotive/vehicle/VehicleLightState.aidl | 0 .../vehicle/VehicleLightSwitch.aidl | 0 .../automotive/vehicle/VehicleOilLevel.aidl | 0 .../automotive/vehicle/VehicleProperty.aidl | 0 .../vehicle/VehiclePropertyGroup.aidl | 0 .../vehicle/VehiclePropertyType.aidl | 0 .../vehicle/VehicleSeatOccupancyState.aidl | 0 .../automotive/vehicle/VehicleTurnSignal.aidl | 0 .../automotive/vehicle/VehicleUnit.aidl | 0 .../vehicle/VehicleVendorPermission.aidl | 0 ...msAvailabilityStateIntegerValuesIndex.aidl | 0 .../VmsBaseMessageIntegerValuesIndex.aidl | 0 .../automotive/vehicle/VmsMessageType.aidl | 0 ...LayerAndPublisherIdIntegerValuesIndex.aidl | 0 ...VmsMessageWithLayerIntegerValuesIndex.aidl | 0 .../VmsOfferingMessageIntegerValuesIndex.aidl | 0 ...ublisherInformationIntegerValuesIndex.aidl | 0 ...StartSessionMessageIntegerValuesIndex.aidl | 0 ...sSubscriptionsStateIntegerValuesIndex.aidl | 0 .../automotive/vehicle/CreateUserRequest.aidl | 0 .../vehicle/CreateUserResponse.aidl | 0 .../automotive/vehicle/CreateUserStatus.aidl | 0 .../automotive/vehicle/CustomInputType.aidl | 0 .../vehicle/DiagnosticFloatSensorIndex.aidl | 0 .../vehicle/DiagnosticIntegerSensorIndex.aidl | 0 .../ElectronicTollCollectionCardStatus.aidl | 0 .../ElectronicTollCollectionCardType.aidl | 0 .../automotive/vehicle/EvChargeState.aidl | 0 .../automotive/vehicle/EvConnectorType.aidl | 0 .../vehicle/EvRegenerativeBrakingState.aidl | 0 .../automotive/vehicle/EvStoppingMode.aidl | 0 .../vehicle/EvsServiceRequestIndex.aidl | 0 .../automotive/vehicle/EvsServiceState.aidl | 0 .../automotive/vehicle/EvsServiceType.aidl | 0 .../hardware/automotive/vehicle/FuelType.aidl | 0 .../vehicle/GsrComplianceRequirementType.aidl | 0 .../vehicle/InitialUserInfoRequest.aidl | 0 .../vehicle/InitialUserInfoRequestType.aidl | 0 .../vehicle/InitialUserInfoResponse.aidl | 0 .../InitialUserInfoResponseAction.aidl | 0 .../vehicle/Obd2CommonIgnitionMonitors.aidl | 0 .../Obd2CompressionIgnitionMonitors.aidl | 0 .../vehicle/Obd2FuelSystemStatus.aidl | 0 .../automotive/vehicle/Obd2FuelType.aidl | 0 .../vehicle/Obd2IgnitionMonitorKind.aidl | 0 .../vehicle/Obd2SecondaryAirStatus.aidl | 0 .../vehicle/Obd2SparkIgnitionMonitors.aidl | 0 .../automotive/vehicle/PortLocationType.aidl | 0 .../vehicle/ProcessTerminationReason.aidl | 0 .../automotive/vehicle/RemoveUserRequest.aidl | 0 .../automotive/vehicle/RotaryInputType.aidl | 0 .../vehicle/SwitchUserMessageType.aidl | 0 .../automotive/vehicle/SwitchUserRequest.aidl | 0 .../vehicle/SwitchUserResponse.aidl | 0 .../automotive/vehicle/SwitchUserStatus.aidl | 0 .../automotive/vehicle/TrailerState.aidl | 0 .../UserIdentificationAssociation.aidl | 0 ...UserIdentificationAssociationSetValue.aidl | 0 .../UserIdentificationAssociationType.aidl | 0 .../UserIdentificationAssociationValue.aidl | 0 .../vehicle/UserIdentificationGetRequest.aidl | 0 .../vehicle/UserIdentificationResponse.aidl | 0 .../UserIdentificationSetAssociation.aidl | 0 .../vehicle/UserIdentificationSetRequest.aidl | 0 .../hardware/automotive/vehicle/UserInfo.aidl | 0 .../automotive/vehicle/UsersInfo.aidl | 0 .../vehicle/VehicleApPowerBootupReason.aidl | 0 .../VehicleApPowerStateConfigFlag.aidl | 0 .../vehicle/VehicleApPowerStateReport.aidl | 0 .../vehicle/VehicleApPowerStateReq.aidl | 0 .../vehicle/VehicleApPowerStateReqIndex.aidl | 0 .../VehicleApPowerStateShutdownParam.aidl | 0 .../automotive/vehicle/VehicleArea.aidl | 0 .../automotive/vehicle/VehicleAreaDoor.aidl | 0 .../automotive/vehicle/VehicleAreaMirror.aidl | 0 .../automotive/vehicle/VehicleAreaSeat.aidl | 0 .../automotive/vehicle/VehicleAreaWheel.aidl | 0 .../automotive/vehicle/VehicleAreaWindow.aidl | 0 .../automotive/vehicle/VehicleDisplay.aidl | 0 .../automotive/vehicle/VehicleGear.aidl | 0 .../vehicle/VehicleHvacFanDirection.aidl | 0 .../vehicle/VehicleHwKeyInputAction.aidl | 0 .../VehicleHwMotionButtonStateFlag.aidl | 0 .../vehicle/VehicleHwMotionInputAction.aidl | 0 .../vehicle/VehicleHwMotionInputSource.aidl | 0 .../vehicle/VehicleHwMotionToolType.aidl | 0 .../vehicle/VehicleIgnitionState.aidl | 0 .../automotive/vehicle/VehicleLightState.aidl | 0 .../vehicle/VehicleLightSwitch.aidl | 0 .../automotive/vehicle/VehicleOilLevel.aidl | 0 .../automotive/vehicle/VehicleProperty.aidl | 0 .../vehicle/VehiclePropertyGroup.aidl | 0 .../vehicle/VehiclePropertyType.aidl | 0 .../vehicle/VehicleSeatOccupancyState.aidl | 0 .../automotive/vehicle/VehicleTurnSignal.aidl | 0 .../automotive/vehicle/VehicleUnit.aidl | 0 .../vehicle/VehicleVendorPermission.aidl | 0 ...msAvailabilityStateIntegerValuesIndex.aidl | 0 .../VmsBaseMessageIntegerValuesIndex.aidl | 0 .../automotive/vehicle/VmsMessageType.aidl | 0 ...LayerAndPublisherIdIntegerValuesIndex.aidl | 0 ...VmsMessageWithLayerIntegerValuesIndex.aidl | 0 .../VmsOfferingMessageIntegerValuesIndex.aidl | 0 ...ublisherInformationIntegerValuesIndex.aidl | 0 ...StartSessionMessageIntegerValuesIndex.aidl | 0 ...sSubscriptionsStateIntegerValuesIndex.aidl | 0 .../automotive/vehicle/CreateUserRequest.aidl | 0 .../vehicle/CreateUserResponse.aidl | 0 .../automotive/vehicle/CreateUserStatus.aidl | 0 .../automotive/vehicle/CustomInputType.aidl | 0 .../vehicle/DiagnosticFloatSensorIndex.aidl | 0 .../vehicle/DiagnosticIntegerSensorIndex.aidl | 0 .../ElectronicTollCollectionCardStatus.aidl | 0 .../ElectronicTollCollectionCardType.aidl | 0 .../automotive/vehicle/EvChargeState.aidl | 0 .../automotive/vehicle/EvConnectorType.aidl | 0 .../vehicle/EvRegenerativeBrakingState.aidl | 0 .../automotive/vehicle/EvStoppingMode.aidl | 0 .../vehicle/EvsServiceRequestIndex.aidl | 0 .../automotive/vehicle/EvsServiceState.aidl | 0 .../automotive/vehicle/EvsServiceType.aidl | 0 .../hardware/automotive/vehicle/FuelType.aidl | 0 .../vehicle/GsrComplianceRequirementType.aidl | 0 .../vehicle/InitialUserInfoRequest.aidl | 0 .../vehicle/InitialUserInfoRequestType.aidl | 0 .../vehicle/InitialUserInfoResponse.aidl | 0 .../InitialUserInfoResponseAction.aidl | 0 .../vehicle/Obd2CommonIgnitionMonitors.aidl | 0 .../Obd2CompressionIgnitionMonitors.aidl | 0 .../vehicle/Obd2FuelSystemStatus.aidl | 0 .../automotive/vehicle/Obd2FuelType.aidl | 0 .../vehicle/Obd2IgnitionMonitorKind.aidl | 0 .../vehicle/Obd2SecondaryAirStatus.aidl | 0 .../vehicle/Obd2SparkIgnitionMonitors.aidl | 0 .../automotive/vehicle/PortLocationType.aidl | 0 .../vehicle/ProcessTerminationReason.aidl | 0 .../automotive/vehicle/RemoveUserRequest.aidl | 0 .../automotive/vehicle/RotaryInputType.aidl | 0 .../vehicle/SwitchUserMessageType.aidl | 0 .../automotive/vehicle/SwitchUserRequest.aidl | 0 .../vehicle/SwitchUserResponse.aidl | 0 .../automotive/vehicle/SwitchUserStatus.aidl | 0 .../automotive/vehicle/TrailerState.aidl | 0 .../UserIdentificationAssociation.aidl | 0 ...UserIdentificationAssociationSetValue.aidl | 0 .../UserIdentificationAssociationType.aidl | 0 .../UserIdentificationAssociationValue.aidl | 0 .../vehicle/UserIdentificationGetRequest.aidl | 0 .../vehicle/UserIdentificationResponse.aidl | 0 .../UserIdentificationSetAssociation.aidl | 0 .../vehicle/UserIdentificationSetRequest.aidl | 0 .../hardware/automotive/vehicle/UserInfo.aidl | 0 .../automotive/vehicle/UsersInfo.aidl | 0 .../vehicle/VehicleApPowerBootupReason.aidl | 0 .../VehicleApPowerStateConfigFlag.aidl | 0 .../vehicle/VehicleApPowerStateReport.aidl | 0 .../vehicle/VehicleApPowerStateReq.aidl | 0 .../vehicle/VehicleApPowerStateReqIndex.aidl | 0 .../VehicleApPowerStateShutdownParam.aidl | 0 .../automotive/vehicle/VehicleArea.aidl | 0 .../automotive/vehicle/VehicleAreaDoor.aidl | 0 .../automotive/vehicle/VehicleAreaMirror.aidl | 0 .../automotive/vehicle/VehicleAreaSeat.aidl | 0 .../automotive/vehicle/VehicleAreaWheel.aidl | 0 .../automotive/vehicle/VehicleAreaWindow.aidl | 0 .../automotive/vehicle/VehicleDisplay.aidl | 0 .../automotive/vehicle/VehicleGear.aidl | 0 .../vehicle/VehicleHvacFanDirection.aidl | 0 .../vehicle/VehicleHwKeyInputAction.aidl | 0 .../VehicleHwMotionButtonStateFlag.aidl | 0 .../vehicle/VehicleHwMotionInputAction.aidl | 0 .../vehicle/VehicleHwMotionInputSource.aidl | 0 .../vehicle/VehicleHwMotionToolType.aidl | 0 .../vehicle/VehicleIgnitionState.aidl | 0 .../automotive/vehicle/VehicleLightState.aidl | 0 .../vehicle/VehicleLightSwitch.aidl | 0 .../automotive/vehicle/VehicleOilLevel.aidl | 0 .../automotive/vehicle/VehicleProperty.aidl | 0 .../vehicle/VehiclePropertyGroup.aidl | 0 .../vehicle/VehiclePropertyType.aidl | 0 .../vehicle/VehicleSeatOccupancyState.aidl | 0 .../automotive/vehicle/VehicleTurnSignal.aidl | 0 .../automotive/vehicle/VehicleUnit.aidl | 0 .../vehicle/VehicleVendorPermission.aidl | 0 ...msAvailabilityStateIntegerValuesIndex.aidl | 0 .../VmsBaseMessageIntegerValuesIndex.aidl | 0 .../automotive/vehicle/VmsMessageType.aidl | 0 ...LayerAndPublisherIdIntegerValuesIndex.aidl | 0 ...VmsMessageWithLayerIntegerValuesIndex.aidl | 0 .../VmsOfferingMessageIntegerValuesIndex.aidl | 0 ...ublisherInformationIntegerValuesIndex.aidl | 0 ...StartSessionMessageIntegerValuesIndex.aidl | 0 ...sSubscriptionsStateIntegerValuesIndex.aidl | 0 automotive/vehicle/vhal_static_cpp_lib.mk | 4 +- 261 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 automotive/vehicle/aidl_property/Android.bp create mode 100644 automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/.hash rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/CreateUserRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/CreateUserResponse.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/CreateUserStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/CustomInputType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/EvChargeState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/EvConnectorType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/EvsServiceState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/EvsServiceType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/FuelType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/Obd2FuelType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/PortLocationType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/RemoveUserRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/RotaryInputType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/SwitchUserRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/SwitchUserResponse.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/SwitchUserStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/TrailerState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UserInfo.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/UsersInfo.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleArea.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleDisplay.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleGear.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleLightState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleOilLevel.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleProperty.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehiclePropertyType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleUnit.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsMessageType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/1/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/CreateUserRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/CreateUserResponse.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/CreateUserStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/CustomInputType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/EvChargeState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/EvConnectorType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/EvStoppingMode.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/EvsServiceState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/EvsServiceType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/FuelType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/Obd2FuelType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/PortLocationType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/RemoveUserRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/RotaryInputType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/SwitchUserRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/SwitchUserResponse.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/SwitchUserStatus.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/TrailerState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UserInfo.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/UsersInfo.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleArea.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleDisplay.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleGear.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleLightState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleOilLevel.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleProperty.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehiclePropertyType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleUnit.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsMessageType.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl/aidl_api/android.hardware.automotive.vehicle => aidl_property/aidl_api/android.hardware.automotive.vehicle.property}/current/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/CreateUserRequest.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/CreateUserResponse.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/CreateUserStatus.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/CustomInputType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/EvChargeState.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/EvConnectorType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/EvStoppingMode.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/EvsServiceState.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/EvsServiceType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/FuelType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/Obd2FuelType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/PortLocationType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/RemoveUserRequest.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/RotaryInputType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/SwitchUserRequest.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/SwitchUserResponse.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/SwitchUserStatus.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/TrailerState.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UserInfo.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/UsersInfo.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleArea.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleDisplay.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleGear.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleLightState.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleOilLevel.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleProperty.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehiclePropertyType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleUnit.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsMessageType.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl (100%) rename automotive/vehicle/{aidl => aidl_property}/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl (100%) diff --git a/automotive/vehicle/Android.bp b/automotive/vehicle/Android.bp index f4a7cd16eb..c0d71d7dac 100644 --- a/automotive/vehicle/Android.bp +++ b/automotive/vehicle/Android.bp @@ -22,5 +22,6 @@ cc_defaults { name: "VehicleHalInterfaceDefaults", static_libs: [ "android.hardware.automotive.vehicle-V2-ndk", + "android.hardware.automotive.vehicle.property-V2-ndk", ], } diff --git a/automotive/vehicle/aidl/Android.bp b/automotive/vehicle/aidl/Android.bp index 18a504698c..9c8d9c5f6d 100644 --- a/automotive/vehicle/aidl/Android.bp +++ b/automotive/vehicle/aidl/Android.bp @@ -25,7 +25,7 @@ aidl_interface { name: "android.hardware.automotive.vehicle", vendor_available: true, srcs: [ - "android/hardware/automotive/vehicle/**/*.aidl", + "android/hardware/automotive/vehicle/*.aidl", ], frozen: false, stability: "vintf", diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/.hash b/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/.hash index f4785043b5..d9fd5adc1d 100644 --- a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/.hash +++ b/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/.hash @@ -1 +1,2 @@ 8610b651e162c614a97542d6f4ed039c969823e5 +0678e142246842695c1ba0524592fe2c3b789fc6 diff --git a/automotive/vehicle/aidl/aidl_test/Android.bp b/automotive/vehicle/aidl/aidl_test/Android.bp index cf7ef1e404..44d7445d25 100644 --- a/automotive/vehicle/aidl/aidl_test/Android.bp +++ b/automotive/vehicle/aidl/aidl_test/Android.bp @@ -52,6 +52,7 @@ android_test { ], static_libs: [ "android.hardware.automotive.vehicle-V2-java", + "android.hardware.automotive.vehicle.property-V2-java", "androidx.test.runner", "truth-prebuilt", ], diff --git a/automotive/vehicle/aidl_property/Android.bp b/automotive/vehicle/aidl_property/Android.bp new file mode 100644 index 0000000000..58ce50d6e8 --- /dev/null +++ b/automotive/vehicle/aidl_property/Android.bp @@ -0,0 +1,53 @@ +// Copyright (C) 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "hardware_interfaces_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["hardware_interfaces_license"], +} + +aidl_interface { + name: "android.hardware.automotive.vehicle.property", + vendor_available: true, + srcs: [ + // This HAL was originally part of android.hardware.automotive.vehicle + "android/hardware/automotive/vehicle/*.aidl", + ], + frozen: false, + stability: "vintf", + backend: { + cpp: { + enabled: false, + }, + java: { + sdk_version: "module_current", + min_sdk_version: "31", + apex_available: [ + "//apex_available:platform", + "com.android.car.framework", + ], + }, + }, + versions_with_info: [ + { + version: "1", + imports: [], + }, + ], + +} diff --git a/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/.hash b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/.hash new file mode 100644 index 0000000000..02d7352c60 --- /dev/null +++ b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/.hash @@ -0,0 +1,2 @@ +8610b651e162c614a97542d6f4ed039c969823e5 +d80c4423311162bf7e4fdda8c7be2bad2371cc00 diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/CreateUserRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/CreateUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/CreateUserRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/CreateUserRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/CreateUserResponse.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/CreateUserResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/CreateUserResponse.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/CreateUserResponse.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/CreateUserStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/CreateUserStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/CreateUserStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/CreateUserStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/CustomInputType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/CustomInputType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/CustomInputType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/CustomInputType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvChargeState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvChargeState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvChargeState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvChargeState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvConnectorType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvConnectorType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvConnectorType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvConnectorType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvsServiceState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvsServiceState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvsServiceState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvsServiceState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvsServiceType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvsServiceType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/EvsServiceType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/EvsServiceType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/FuelType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/FuelType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/FuelType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/FuelType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2FuelType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2FuelType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2FuelType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2FuelType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/PortLocationType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/PortLocationType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/PortLocationType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/PortLocationType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/RemoveUserRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/RemoveUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/RemoveUserRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/RemoveUserRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/RotaryInputType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/RotaryInputType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/RotaryInputType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/RotaryInputType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/SwitchUserRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/SwitchUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/SwitchUserRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/SwitchUserRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/SwitchUserResponse.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/SwitchUserResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/SwitchUserResponse.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/SwitchUserResponse.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/SwitchUserStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/SwitchUserStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/SwitchUserStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/SwitchUserStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/TrailerState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/TrailerState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/TrailerState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/TrailerState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserInfo.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserInfo.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UserInfo.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UserInfo.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UsersInfo.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UsersInfo.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/UsersInfo.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/UsersInfo.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleArea.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleArea.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleArea.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleArea.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleDisplay.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleDisplay.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleDisplay.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleDisplay.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleGear.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleGear.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleGear.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleGear.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleLightState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleLightState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleLightState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleLightState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleOilLevel.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleOilLevel.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleOilLevel.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleOilLevel.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleProperty.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleProperty.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleProperty.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleProperty.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehiclePropertyType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehiclePropertyType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehiclePropertyType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehiclePropertyType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleUnit.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleUnit.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleUnit.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleUnit.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsMessageType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsMessageType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsMessageType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsMessageType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/1/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/1/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/CreateUserRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/CreateUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/CreateUserRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/CreateUserRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/CreateUserResponse.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/CreateUserResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/CreateUserResponse.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/CreateUserResponse.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/CreateUserStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/CreateUserStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/CreateUserStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/CreateUserStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/CustomInputType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/CustomInputType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/CustomInputType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/CustomInputType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvChargeState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvChargeState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvChargeState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvChargeState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvConnectorType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvConnectorType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvConnectorType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvConnectorType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvStoppingMode.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvStoppingMode.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvStoppingMode.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvStoppingMode.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvsServiceState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvsServiceState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvsServiceState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvsServiceState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvsServiceType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvsServiceType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/EvsServiceType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/EvsServiceType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/FuelType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/FuelType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/FuelType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/FuelType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2FuelType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2FuelType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2FuelType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2FuelType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/PortLocationType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/PortLocationType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/PortLocationType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/PortLocationType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/RemoveUserRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/RemoveUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/RemoveUserRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/RemoveUserRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/RotaryInputType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/RotaryInputType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/RotaryInputType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/RotaryInputType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/SwitchUserRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/SwitchUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/SwitchUserRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/SwitchUserRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/SwitchUserResponse.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/SwitchUserResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/SwitchUserResponse.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/SwitchUserResponse.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/SwitchUserStatus.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/SwitchUserStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/SwitchUserStatus.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/SwitchUserStatus.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/TrailerState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/TrailerState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/TrailerState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/TrailerState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserInfo.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserInfo.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UserInfo.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UserInfo.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UsersInfo.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UsersInfo.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/UsersInfo.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/UsersInfo.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleArea.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleArea.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleArea.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleArea.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleDisplay.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleDisplay.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleDisplay.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleDisplay.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleGear.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleGear.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleGear.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleGear.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleLightState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleLightState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleLightState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleLightState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleOilLevel.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleOilLevel.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleOilLevel.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleOilLevel.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleProperty.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleProperty.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleProperty.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleProperty.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehiclePropertyType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehiclePropertyType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehiclePropertyType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehiclePropertyType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleUnit.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleUnit.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleUnit.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleUnit.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsMessageType.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsMessageType.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsMessageType.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsMessageType.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/CreateUserRequest.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/CreateUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/CreateUserRequest.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/CreateUserRequest.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/CreateUserResponse.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/CreateUserResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/CreateUserResponse.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/CreateUserResponse.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/CreateUserStatus.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/CreateUserStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/CreateUserStatus.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/CreateUserStatus.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/CustomInputType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/CustomInputType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/CustomInputType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/CustomInputType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/DiagnosticFloatSensorIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/DiagnosticIntegerSensorIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/ElectronicTollCollectionCardStatus.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/ElectronicTollCollectionCardType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvChargeState.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvChargeState.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvChargeState.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvChargeState.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvConnectorType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvConnectorType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvConnectorType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvConnectorType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvRegenerativeBrakingState.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvStoppingMode.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvStoppingMode.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvStoppingMode.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvStoppingMode.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvsServiceRequestIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvsServiceState.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvsServiceState.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvsServiceState.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvsServiceState.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvsServiceType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvsServiceType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/EvsServiceType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/EvsServiceType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/FuelType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/FuelType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/FuelType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/FuelType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/InitialUserInfoRequest.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/InitialUserInfoRequestType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/InitialUserInfoResponse.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/InitialUserInfoResponseAction.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2CompressionIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2FuelType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2FuelType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2FuelType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2FuelType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2IgnitionMonitorKind.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2SecondaryAirStatus.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/Obd2SparkIgnitionMonitors.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/PortLocationType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/PortLocationType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/PortLocationType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/PortLocationType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/ProcessTerminationReason.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/RemoveUserRequest.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/RemoveUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/RemoveUserRequest.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/RemoveUserRequest.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/RotaryInputType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/RotaryInputType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/RotaryInputType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/RotaryInputType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/SwitchUserMessageType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/SwitchUserRequest.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/SwitchUserRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/SwitchUserRequest.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/SwitchUserRequest.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/SwitchUserResponse.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/SwitchUserResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/SwitchUserResponse.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/SwitchUserResponse.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/SwitchUserStatus.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/SwitchUserStatus.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/SwitchUserStatus.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/SwitchUserStatus.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/TrailerState.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/TrailerState.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/TrailerState.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/TrailerState.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationAssociation.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationAssociationSetValue.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationAssociationType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationAssociationValue.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationGetRequest.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationResponse.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationSetAssociation.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserIdentificationSetRequest.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserInfo.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserInfo.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UserInfo.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UserInfo.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/UsersInfo.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UsersInfo.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/UsersInfo.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/UsersInfo.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerBootupReason.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateConfigFlag.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateReport.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateReq.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateReqIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleApPowerStateShutdownParam.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleArea.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleArea.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleArea.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleArea.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaDoor.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaMirror.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaWheel.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaWindow.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleDisplay.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleDisplay.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleDisplay.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleDisplay.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleGear.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleGear.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleGear.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleGear.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHvacFanDirection.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwKeyInputAction.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwMotionButtonStateFlag.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwMotionInputAction.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwMotionInputSource.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleHwMotionToolType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleIgnitionState.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleLightState.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleLightState.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleLightState.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleLightState.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleLightSwitch.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleOilLevel.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleOilLevel.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleOilLevel.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleOilLevel.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleProperty.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleProperty.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehiclePropertyGroup.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehiclePropertyType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehiclePropertyType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehiclePropertyType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehiclePropertyType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleSeatOccupancyState.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleTurnSignal.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleUnit.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleUnit.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleUnit.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleUnit.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleVendorPermission.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsAvailabilityStateIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsBaseMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsMessageType.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsMessageType.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsMessageType.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsMessageType.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsMessageWithLayerIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsOfferingMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsPublisherInformationIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsStartSessionMessageIntegerValuesIndex.aidl diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl similarity index 100% rename from automotive/vehicle/aidl/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl rename to automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VmsSubscriptionsStateIntegerValuesIndex.aidl diff --git a/automotive/vehicle/vhal_static_cpp_lib.mk b/automotive/vehicle/vhal_static_cpp_lib.mk index b15b26cfe5..995589c47e 100644 --- a/automotive/vehicle/vhal_static_cpp_lib.mk +++ b/automotive/vehicle/vhal_static_cpp_lib.mk @@ -15,4 +15,6 @@ # This make file contains the latest version of static cpp libraries for VHAL # interface and VHAL properties. -LOCAL_STATIC_LIBRARIES += android.hardware.automotive.vehicle-V2-ndk +LOCAL_STATIC_LIBRARIES += \ + android.hardware.automotive.vehicle-V2-ndk \ + android.hardware.automotive.vehicle.property-V2-ndk