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

Commit 9aeb8e09 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6694650 from 6e5eedbf to rvc-qpr1-release 

Change-Id: I4794c7a6eaf6163509f53ebcc569cbf64da8fb04
parents 4ad55ad6 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 {};

wifi/1.4/default/android.hardware.wifi@1.0-service-lazy.rc

+4 −0
Original line number Diff line number Diff line 
service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service-lazy

    interface android.hardware.wifi@1.0::IWifi default

    interface android.hardware.wifi@1.1::IWifi default

    interface android.hardware.wifi@1.2::IWifi default

    interface android.hardware.wifi@1.3::IWifi default

    interface android.hardware.wifi@1.4::IWifi default

    oneshot

    disabled

    class hal