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

Commit 6e3c5921 authored by Kai Wang's avatar Kai Wang Committed by Automerger Merge Worker
Browse files

Merge "Rename Unix_time property to EPOCH_TIME" into sc-dev am: afc11519 am: 461dd8c4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14555283

Change-Id: Ib046b45a1a5a993cc1b3146e33b9ebdae9c9f4e6
parents ad6da053 461dd8c4

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

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

                .config =

                        {

                                .prop = toInt(VehicleProperty::UNIX_TIME),

                                .prop = toInt(VehicleProperty::EPOCH_TIME),

                                .access = VehiclePropertyAccess::READ_WRITE,

                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                        },

automotive/vehicle/2.0/types.hal

+1 −1
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ enum VehicleProperty : int32_t { 
     * @access VehiclePropertyAccess:READ_WRITE

     * @unit VehicleUnit:MILLI_SECS

     */

    UNIX_TIME = (

    EPOCH_TIME = (

        0x0606

        | VehiclePropertyGroup:SYSTEM

        | VehiclePropertyType:INT64