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

Commit 2c9ff574 authored by Aaqib Ismail's avatar Aaqib Ismail Committed by Android (Google) Code Review
Browse files

Merge "Add HAL changes for DOOR_CHILD_LOCK_ENABLED"

parents 5bc9dcc6 2048670d

automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleProperty.aidl

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ enum VehicleProperty { 
  DOOR_POS = 373295872,

  DOOR_MOVE = 373295873,

  DOOR_LOCK = 371198722,

  DOOR_CHILD_LOCK_ENABLED = 371198723,

  MIRROR_Z_POS = 339741504,

  MIRROR_Z_MOVE = 339741505,

  MIRROR_Y_POS = 339741506,

automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleProperty.aidl

+14 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.hardware.automotive.vehicle;



import android.hardware.automotive.vehicle.VehicleArea;

import android.hardware.automotive.vehicle.VehiclePropertyGroup;

import android.hardware.automotive.vehicle.VehiclePropertyType;

/**

 * Declares all vehicle properties. VehicleProperty has a bitwise structure.
@@ -1317,6 +1319,18 @@ enum VehicleProperty { 
     */

    DOOR_LOCK = 0x0B02 + 0x10000000 + 0x06000000

            + 0x00200000, // VehiclePropertyGroup:SYSTEM,VehicleArea:DOOR,VehiclePropertyType:BOOLEAN

    /**

     * Door child lock feature enabled

     *

     * Returns true if the door child lock feature is enabled and false if it is disabled.

     *

     * If enabled, the door is unable to be opened from the inside.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     */

    DOOR_CHILD_LOCK_ENABLED =

            0x0B03 + VehiclePropertyGroup.SYSTEM + VehicleArea.DOOR + VehiclePropertyType.BOOLEAN,

    /**

     * Mirror Z Position

     *
@@ -2889,5 +2903,4 @@ enum VehicleProperty { 
     */

    SUPPORTED_PROPERTY_IDS = 0x0F48 + 0x10000000 + 0x01000000

            + 0x00410000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:INT32_VEC



}

automotive/vehicle/aidl/generated_lib/cpp/AccessForVehicleProperty.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::DOOR_POS, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::DOOR_MOVE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::DOOR_LOCK, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::DOOR_CHILD_LOCK_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::MIRROR_Z_POS, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::MIRROR_Z_MOVE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::MIRROR_Y_POS, VehiclePropertyAccess::READ_WRITE},

automotive/vehicle/aidl/generated_lib/cpp/ChangeModeForVehicleProperty.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::DOOR_POS, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::DOOR_MOVE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::DOOR_LOCK, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::DOOR_CHILD_LOCK_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::MIRROR_Z_POS, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::MIRROR_Z_MOVE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::MIRROR_Y_POS, VehiclePropertyChangeMode::ON_CHANGE},

automotive/vehicle/aidl/generated_lib/java/AccessForVehicleProperty.java

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.DOOR_POS, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.DOOR_MOVE, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.DOOR_LOCK, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.DOOR_CHILD_LOCK_ENABLED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.MIRROR_Z_POS, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.MIRROR_Z_MOVE, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.MIRROR_Y_POS, VehiclePropertyAccess.READ_WRITE),