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

Commit 8de72df4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed EmulatedUserHal so it supports... 

Merge "Fixed EmulatedUserHal so it supports SwitchUserMessageType::VEHICLE_REQUEST" into rvc-qpr-dev am: 6e5eedbf

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

Change-Id: Ic801c82c89df1858a073f7caeffafbce1825c9fc
parents f0d4ef79 6e5eedbf

automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedUserHal.cpp

+9 −0
Original line number Diff line number Diff line
@@ -155,6 +155,15 @@ android::base::Result<std::unique_ptr<VehiclePropValue>> EmulatedUserHal::onSetS 
    }



    if (value.areaId != 0) {

        if (value.value.int32Values.size() >= 2 &&

            static_cast<SwitchUserMessageType>(value.value.int32Values[1]) ==

                    SwitchUserMessageType::VEHICLE_REQUEST) {

            // User HAL can also request a user switch, so we need to check it first

            ALOGD("set(SWITCH_USER) called from lshal to emulate a vehicle request: %s",

                  toString(value).c_str());

            return std::unique_ptr<VehiclePropValue>(new VehiclePropValue(value));

        }

        // Otherwise, we store it

        ALOGD("set(SWITCH_USER) called from lshal; storing it: %s", toString(value).c_str());

        mSwitchUserResponseFromCmd.reset(new VehiclePropValue(value));

        return {};