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

Commit 5b30be06 authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Automerger Merge Worker
Browse files

Merge "Use `ro.boot.qemu` to check if the device is an emulator" am:... 

Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: 03fb28b9 am: f3593338 am: 02118721

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68c162c5b3f7e2721a915cb4a45b4a29727ab428
parents f0e5af89 02118721

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

+0 −11
Original line number Diff line number Diff line
@@ -276,17 +276,6 @@ static bool isDiagnosticProperty(VehiclePropConfig propConfig) { 
    return false;

}



// determine if it's running inside Android Emulator

static bool isInEmulator() {

    char propValue[PROP_VALUE_MAX];

    bool isEmulator = (__system_property_get("ro.kernel.qemu", propValue) != 0);

    if (!isEmulator) {

        isEmulator = (__system_property_get("ro.hardware", propValue) != 0) &&

                     (!strcmp(propValue, "ranchu") || !strcmp(propValue, "goldfish"));

    }

    return isEmulator;

}



// Parse supported properties list and generate vector of property values to hold current values.

void EmulatedVehicleHal::onCreate() {

    static constexpr bool shouldUpdateStatus = true;

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

+5 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ VehicleEmulator::VehicleEmulator(EmulatedVehicleHalIface* hal) : mHal{hal} { 
    mSocketComm = std::make_unique<SocketComm>(this);

    mSocketComm->start();



    if (android::base::GetBoolProperty("ro.kernel.qemu", false)) {

    if (isInEmulator()) {

        ALOGI("Starting PipeComm");

        mPipeComm = std::make_unique<PipeComm>(this);

        mPipeComm->start();
@@ -226,6 +226,10 @@ void VehicleEmulator::populateProtoVehiclePropValue(vhal_proto::VehiclePropValue 
    return proto_msg_converter::toProto(protoVal, *val);

}



bool isInEmulator() {

    return android::base::GetBoolProperty("ro.boot.qemu", false);

}



}  // impl



}  // namespace V2_0

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

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ private: 
    std::unique_ptr<PipeComm> mPipeComm;

};



// determine if it's running inside Android Emulator

bool isInEmulator();



}  // impl



}  // namespace V2_0