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

Commit 85518c4b authored by Steve Paik's avatar Steve Paik Committed by android-build-merger
Browse files

Merge "Fix AP_POWER_BOOTUP_REASON to be static" into pi-dev 

am: 3df7964f

Change-Id: Ifbfd8590011801f0d2ddab7a3a01bab0f01a0ac1
parents 44a5fda1 3df7964f

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ const ConfigDeclaration kVehicleProperties[]{ 




    {.config = {.prop = toInt(VehicleProperty::AP_POWER_BOOTUP_REASON),

    {.config = {.prop = toInt(VehicleProperty::AP_POWER_BOOTUP_REASON),

                .access = VehiclePropertyAccess::READ,

                .access = VehiclePropertyAccess::READ,

                .changeMode = VehiclePropertyChangeMode::ON_CHANGE},

                .changeMode = VehiclePropertyChangeMode::STATIC},

     .initialValue = {.int32Values = {toInt(VehicleApPowerBootupReason::USER_POWER_ON)}}},

     .initialValue = {.int32Values = {toInt(VehicleApPowerBootupReason::USER_POWER_ON)}}},





    {

    {

automotive/vehicle/2.0/types.hal

+2 −0
Original line number Original line Diff line number Diff line
@@ -510,6 +510,7 @@ enum VehicleProperty: int32_t { 
     *

     *

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE

     * @access VehiclePropertyAccess:READ

     * @access VehiclePropertyAccess:READ

     * @data_enum VehicleTurnSignal

     */

     */

    TURN_SIGNAL_STATE = (

    TURN_SIGNAL_STATE = (

        0x0408

        0x0408
@@ -522,6 +523,7 @@ enum VehicleProperty: int32_t { 
     *

     *

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE

     * @access VehiclePropertyAccess:READ

     * @access VehiclePropertyAccess:READ

     * @data_enum VehicleIgnitionState

     */

     */

    IGNITION_STATE = (

    IGNITION_STATE = (

        0x0409

        0x0409

current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -294,7 +294,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar 
3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types

3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types

b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle

b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle

80fb4156fa91ce86e49bd2cabe215078f6b69591d416a09e914532eae6712052 android.hardware.automotive.vehicle@2.0::IVehicleCallback

80fb4156fa91ce86e49bd2cabe215078f6b69591d416a09e914532eae6712052 android.hardware.automotive.vehicle@2.0::IVehicleCallback

442de3a3d3819ff8b8bfe9ec710592ca8af7c16bfdb5eb8911b898b8f12b2bb0 android.hardware.automotive.vehicle@2.0::types

4ff0dcfb938a5df283eef47de33b4e1284fab73f584cfc0c94e97317bdb7bf26 android.hardware.automotive.vehicle@2.0::types

32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost

32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost

ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload

ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload

27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types

27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types