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

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

release-request-46bf7ca6-57e7-44b8-8edc-ea8830c1cb3b-for-git_oc-mr1-release-40... 

release-request-46bf7ca6-57e7-44b8-8edc-ea8830c1cb3b-for-git_oc-mr1-release-4090244 snap-temp-L07700000073092334

Change-Id: I2422f198b90e59d55efd0c703064b8d03033d0f0
parents bd592eec 3eb1fd81

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

+12 −4
Original line number Diff line number Diff line
@@ -61,10 +61,11 @@ VehicleHal::VehiclePropValuePtr EmulatedVehicleHal::get( 


StatusCode EmulatedVehicleHal::set(const VehiclePropValue& propValue) {

    if (propValue.prop == kGenerateFakeDataControllingProperty) {

        return handleGenerateFakeDataRequest(propValue);

    };



    if (mHvacPowerProps.count(propValue.prop)) {

        StatusCode status = handleGenerateFakeDataRequest(propValue);

        if (status != StatusCode::OK) {

            return status;

        }

    } else if (mHvacPowerProps.count(propValue.prop)) {

        auto hvacPowerOn = mPropStore->readValueOrNull(toInt(VehicleProperty::HVAC_POWER_ON),

                                                      toInt(VehicleAreaZone::ROW_1));
@@ -176,6 +177,13 @@ bool EmulatedVehicleHal::isContinuousProperty(int32_t propId) const { 
}



bool EmulatedVehicleHal::setPropertyFromVehicle(const VehiclePropValue& propValue) {

    if (propValue.prop == kGenerateFakeDataControllingProperty) {

        StatusCode status = handleGenerateFakeDataRequest(propValue);

        if (status != StatusCode::OK) {

            return false;

        }

    }



    if (mPropStore->writeValue(propValue)) {

        doHalEvent(getValuePool()->obtain(propValue));

        return true;

automotive/vehicle/2.1/types.hal

+3 −0
Original line number Diff line number Diff line
@@ -620,6 +620,9 @@ enum VmsSimpleMessageIntegerValuesIndex : VmsBaseMessageIntegerValuesIndex { 


  /* The version of the VMS layer. */

  VMS_LAYER_VERSION = 2,



  /* The layer type as defined in the vms protocol */

  VMS_LAYER_SUB_TYPE = 3,

};



/*

bluetooth/1.0/default/vendor_interface.cc

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ void VendorInterface::Close() { 


    int power_state = BT_VND_PWR_OFF;

    lib_interface_->op(BT_VND_OP_POWER_CTRL, &power_state);



    lib_interface_->cleanup();

  }



  if (lib_handle_ != nullptr) {

compatibility_matrix.26.xml

0 → 100644
+325 −0
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

    <hal format="hidl" optional="false">

        <name>android.hardware.audio</name>

        <version>2.0</version>

        <interface>

            <name>IDevicesFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.audio.effect</name>

        <version>2.0</version>

        <interface>

            <name>IEffectsFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.automotive.evs</name>

        <version>1.0</version>

        <interface>

            <name>IEvsEnumerator</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.automotive.vehicle</name>

        <version>2.0</version>

        <interface>

            <name>IVehicle</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.biometrics.fingerprint</name>

        <version>2.1</version>

        <interface>

            <name>IBiometricsFingerprint</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.bluetooth</name>

        <version>1.0</version>

        <interface>

            <name>IBluetoothHci</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.boot</name>

        <version>1.0</version>

        <interface>

            <name>IBootControl</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.broadcastradio</name>

        <version>1.0</version>

        <interface>

            <name>IBroadcastRadioFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.camera.provider</name>

        <version>2.4</version>

        <interface>

            <name>ICameraProvider</name>

            <instance>legacy/0</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.configstore</name>

        <version>1.0-1</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.contexthub</name>

        <version>1.0</version>

        <interface>

            <name>IContexthub</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.drm</name>

        <version>1.0</version>

        <interface>

            <name>ICryptoFactory</name>

            <instance>default</instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.dumpstate</name>

        <version>1.0</version>

        <interface>

            <name>IDumpstateDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.gatekeeper</name>

        <version>1.0</version>

        <interface>

            <name>IGatekeeper</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.gnss</name>

        <version>1.0</version>

        <interface>

            <name>IGnss</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.graphics.allocator</name>

        <version>2.0</version>

        <interface>

            <name>IAllocator</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.graphics.composer</name>

        <version>2.1</version>

        <interface>

            <name>IComposer</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.graphics.mapper</name>

        <version>2.0</version>

        <interface>

            <name>IMapper</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.health</name>

        <version>1.0</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.ir</name>

        <version>1.0</version>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.keymaster</name>

        <version>3.0</version>

        <interface>

            <name>IKeymasterDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.light</name>

        <version>2.0</version>

        <interface>

            <name>ILight</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.media.omx</name>

        <version>1.0</version>

        <interface>

            <name>IOmx</name>

            <instance>default</instance>

        </interface>

        <interface>

            <name>IOmxStore</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.memtrack</name>

        <version>1.0</version>

        <interface>

            <name>IMemtrack</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.nfc</name>

        <version>1.0</version>

        <interface>

            <name>INfc</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.power</name>

        <version>1.0</version>

        <interface>

            <name>IPower</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.radio</name>

        <version>1.0</version>

        <interface>

            <name>IRadio</name>

            <instance>slot1</instance>

        </interface>

        <interface>

            <name>ISap</name>

            <instance>slot1</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.radio.deprecated</name>

        <version>1.0</version>

        <interface>

            <name>IOemHook</name>

            <instance>slot1</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.renderscript</name>

        <version>1.0</version>

        <interface>

            <name>IDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.sensors</name>

        <version>1.0</version>

        <interface>

            <name>ISensors</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.soundtrigger</name>

        <version>2.0</version>

        <interface>

            <name>ISoundTriggerHw</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.thermal</name>

        <version>1.0</version>

        <interface>

            <name>IThermal</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.tv.cec</name>

        <version>1.0</version>

        <interface>

            <name>IHdmiCec</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.tv.input</name>

        <version>1.0</version>

        <interface>

            <name>ITvInput</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.usb</name>

        <version>1.0</version>

        <interface>

            <name>IUsb</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.vibrator</name>

        <version>1.0</version>

        <interface>

            <name>IVibrator</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.vr</name>

        <version>1.0</version>

        <interface>

            <name>IVr</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.wifi</name>

        <version>1.0</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.wifi.supplicant</name>

        <version>1.0</version>

        <interface>

            <name>ISupplicant</name>

            <instance>default</instance>

        </interface>

    </hal>

    <kernel version="4.9.0" />

    <kernel version="4.4.0" />

    <kernel version="3.18.0" />

</compatibility-matrix>