Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 10:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* changes:
  Revert "Only allow cuttlefish to use FCM 9 HALs"
  Revert "Allow fingerprint HAL to be updated via apex in U"
This commit is contained in:
Nataniel Borges
2023-07-06 11:41:24 +00:00
committed by Gerrit Code Review
parent c68dc93788 7202c60c3a
commit d74d81bf6e
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compatibility_matrices/Android.mk
View File

@@ -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)

2
compatibility_matrices/compatibility_matrix.8.xml
View File

@@ -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>