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

Commit 0d30daba authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes from topic "current-on-aosp" 

* changes:
  Add health filesystem HAL to compatibility matrix
  Update power hidl to version 1.3 in compatibility_matrix.current.xml.
  Add configstore@1.1 to current matrix.
  Add compatibility_matrix.current.xml for Android Q.
parents 936b3a01 b58edcd1

compatibility_matrices/Android.mk

+13 −0
Original line number Diff line number Diff line
@@ -70,6 +70,18 @@ LOCAL_KERNEL_CONFIG_DATA_PATHS := \ 


include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)



include $(CLEAR_VARS)

include $(LOCAL_PATH)/clear_vars.mk

LOCAL_MODULE := framework_compatibility_matrix.current.xml

LOCAL_MODULE_STEM := compatibility_matrix.current.xml

LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)

LOCAL_KERNEL_CONFIG_DATA_PATHS := \

    4.4.0:$(my_kernel_config_data)/android-4.4 \

    4.9.0:$(my_kernel_config_data)/android-4.9 \

    4.14.0:$(my_kernel_config_data)/android-4.14 \



include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)



my_kernel_config_data :=



# Framework Compatibility Matrix (common to all FCM versions)
@@ -120,6 +132,7 @@ my_system_matrix_deps := \ 
    framework_compatibility_matrix.1.xml \

    framework_compatibility_matrix.2.xml \

    framework_compatibility_matrix.3.xml \

    framework_compatibility_matrix.current.xml \

    framework_compatibility_matrix.device.xml



# Phony target that installs all framework compatibility matrix files

compatibility_matrices/compatibility_matrix.current.xml

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

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

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

        <version>4.0</version>

        <interface>

            <name>IDevicesFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>4.0</version>

        <interface>

            <name>IEffectsFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.authsecret</name>

        <version>1.0</version>

        <interface>

            <name>IAuthSecret</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0</version>

        <interface>

            <name>IAudioControl</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.bluetooth.a2dp</name>

        <version>1.0</version>

        <interface>

            <name>IBluetoothAudioOffload</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-1</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>

            <regex-instance>[^/]+/[0-9]+</regex-instance>

        </interface>

    </hal>

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

        <name>android.hardware.cas</name>

        <version>1.0</version>

        <interface>

            <name>IMediaCasService</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.1</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.confirmationui</name>

        <version>1.0</version>

        <interface>

            <name>IConfirmationUI</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="true">

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

        <version>1.0</version>

        <interface>

            <name>ICryptoFactory</name>

            <regex-instance>.*</regex-instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

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

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

        <version>1.1</version>

        <interface>

            <name>ICryptoFactory</name>

            <regex-instance>.*</regex-instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <regex-instance>.*</regex-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-1</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="false">

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

        <version>2.0</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0</version>

        <interface>

            <name>IFileSystem</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>

        <version>4.0</version>

        <interface>

            <name>IKeymasterDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>4.0</version>

        <interface>

            <name>IKeymasterDevice</name>

            <instance>strongbox</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.neuralnetworks</name>

        <version>1.0</version>

        <interface>

            <name>IDevice</name>

            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

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

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

        <version>1.1</version>

        <interface>

            <name>INfc</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.oemlock</name>

        <version>1.0</version>

        <interface>

            <name>IOemLock</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0-3</version>

        <interface>

            <name>IPower</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0-2</version>

        <interface>

            <name>IRadio</name>

            <instance>slot1</instance>

            <instance>slot2</instance>

            <instance>slot3</instance>

        </interface>

        <interface>

            <name>ISap</name>

            <instance>slot1</instance>

        </interface>

    </hal>

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

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

        <version>1.0</version>

        <interface>

            <name>IRadioConfig</name>

            <instance>default</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.secure_element</name>

        <version>1.0</version>

        <interface>

            <name>ISecureElement</name>

            <regex-instance>eSE[1-9][0-9]*</regex-instance>

            <regex-instance>SIM[1-9][0-9]*</regex-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-1</version>

        <interface>

            <name>ISoundTriggerHw</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tetheroffload.config</name>

        <version>1.0</version>

        <interface>

            <name>IOffloadConfig</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tetheroffload.control</name>

        <version>1.0</version>

        <interface>

            <name>IOffloadControl</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0-1</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-1</version>

        <interface>

            <name>IUsb</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0</version>

        <interface>

            <name>IUsbGadget</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0-2</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.weaver</name>

        <version>1.0</version>

        <interface>

            <name>IWeaver</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0-2</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0</version>

        <interface>

            <name>IHostapd</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0</version>

        <interface>

            <name>IOffload</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.0-1</version>

        <interface>

            <name>ISupplicant</name>

            <instance>default</instance>

        </interface>

    </hal>

</compatibility-matrix>