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

Commit d74d81bf authored by Nataniel Borges's avatar Nataniel Borges Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" 

* changes:
  Revert "Only allow cuttlefish to use FCM 9 HALs"
  Revert "Allow fingerprint HAL to be updated via apex in U"
parents c68dc937 7202c60c

compatibility_matrices/Android.mk

+1 −9
Original line number Diff line number Diff line
@@ -103,16 +103,8 @@ my_system_matrix_deps := \ 
    framework_compatibility_matrix.6.xml \

    framework_compatibility_matrix.7.xml \

    framework_compatibility_matrix.8.xml \

    framework_compatibility_matrix.device.xml \



# Allow only cuttlefish to continue using matrix 9 HALs

# TODO(b/290060286) This is a temporary workaround for trunk stable and

# should be removed once interface versions can be flagged properly.

ifneq (,$(filter device/google/cuttlefish/shared/config/manifest.xml, $(DEVICE_MANIFEST_FILE)))

my_system_matrix_deps += \

    framework_compatibility_matrix.9.xml \



endif

    framework_compatibility_matrix.device.xml \



my_framework_matrix_deps += \

    $(my_system_matrix_deps)

compatibility_matrices/compatibility_matrix.8.xml

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true" updatable-via-apex="true">

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

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

        <version>2</version>

        <interface>