Merge changes from topic "cm_vintf_workaround"

* changes:
  Allow fingerprint HAL to be updated via apex in U
  Only allow cuttlefish to use FCM 9 HALs
This commit is contained in:
Treehugger Robot 2023-07-05 21:33:49 +00:00 committed by Gerrit Code Review
commit 8c45f4ab87
2 changed files with 10 additions and 2 deletions

View file

@ -103,9 +103,17 @@ my_system_matrix_deps := \
framework_compatibility_matrix.6.xml \
framework_compatibility_matrix.7.xml \
framework_compatibility_matrix.8.xml \
framework_compatibility_matrix.9.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
my_framework_matrix_deps += \
$(my_system_matrix_deps)

View file

@ -142,7 +142,7 @@
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<hal format="aidl" optional="true" updatable-via-apex="true">
<name>android.hardware.biometrics.fingerprint</name>
<version>2</version>
<interface>