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

Commit 949d3878 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8920865 from c9d82cd7 to tm-qpr1-release

Change-Id: Idd14fc417fe8ab765aa4d7bc51dc397e0ae9f711
parents 0516a1e4 c9d82cd7
Loading
Loading
Loading
Loading
+40 −0
Original line number Diff line number Diff line
@@ -389,6 +389,46 @@ const std::vector<ConfigDeclaration> kVehicleProperties = {
                               {SEAT_2_RIGHT, {.int32Values = {0}}},
                               {SEAT_2_CENTER, {.int32Values = {0}}}}},

        {.config = {.prop = toInt(VehicleProperty::SEAT_HEIGHT_POS),
                    .access = VehiclePropertyAccess::READ_WRITE,
                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
                    .areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,
                                                      .minInt32Value = -10,
                                                      .maxInt32Value = 10},
                                    VehicleAreaConfig{.areaId = SEAT_1_RIGHT,
                                                      .minInt32Value = -10,
                                                      .maxInt32Value = 10},
                                    VehicleAreaConfig{.areaId = SEAT_2_LEFT,
                                                      .minInt32Value = -10,
                                                      .maxInt32Value = 10},
                                    VehicleAreaConfig{.areaId = SEAT_2_RIGHT,
                                                      .minInt32Value = -10,
                                                      .maxInt32Value = 10},
                                    VehicleAreaConfig{.areaId = SEAT_2_CENTER,
                                                      .minInt32Value = -10,
                                                      .maxInt32Value = 10}}},
         .initialValue = {.int32Values = {0}}},

        {.config = {.prop = toInt(VehicleProperty::SEAT_HEIGHT_MOVE),
                    .access = VehiclePropertyAccess::READ_WRITE,
                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
                    .areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,
                                                      .minInt32Value = -1,
                                                      .maxInt32Value = 1},
                                    VehicleAreaConfig{.areaId = SEAT_1_RIGHT,
                                                      .minInt32Value = -1,
                                                      .maxInt32Value = 1},
                                    VehicleAreaConfig{.areaId = SEAT_2_LEFT,
                                                      .minInt32Value = -1,
                                                      .maxInt32Value = 1},
                                    VehicleAreaConfig{.areaId = SEAT_2_RIGHT,
                                                      .minInt32Value = -1,
                                                      .maxInt32Value = 1},
                                    VehicleAreaConfig{.areaId = SEAT_2_CENTER,
                                                      .minInt32Value = -1,
                                                      .maxInt32Value = 1}}},
         .initialValue = {.int32Values = {0}}},

        {.config =
                 {
                         .prop = toInt(VehicleProperty::SEAT_OCCUPANCY),
+2 −3
Original line number Diff line number Diff line
@@ -107,10 +107,9 @@ ScopedAStatus ContextHub::onHostEndpointConnected(const HostEndpointInfo& in_inf
ScopedAStatus ContextHub::onHostEndpointDisconnected(char16_t in_hostEndpointId) {
    if (mConnectedHostEndpoints.count(in_hostEndpointId) > 0) {
        mConnectedHostEndpoints.erase(in_hostEndpointId);
        return ndk::ScopedAStatus::ok();
    } else {
        return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_ILLEGAL_ARGUMENT));
    }

    return ndk::ScopedAStatus::ok();
}

}  // namespace contexthub