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

Commit 461dd8c4 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

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

Change-Id: Ide6f4b47165d04d6619d8c54ddde105f3580e52c
parents ec52ecc0 afc11519
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ const ConfigDeclaration kVehicleProperties[]{
        {
                .config =
                        {
                                .prop = toInt(VehicleProperty::UNIX_TIME),
                                .prop = toInt(VehicleProperty::EPOCH_TIME),
                                .access = VehiclePropertyAccess::READ_WRITE,
                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
                        },
+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