diff options
| author | Deyao Ren <deyaoren@google.com> | 2022-03-07 19:26:51 +0000 |
|---|---|---|
| committer | Deyao Ren <deyaoren@google.com> | 2022-03-07 19:39:47 +0000 |
| commit | ce06afa11d067d5f82f036b76548e50433951046 (patch) | |
| tree | 9e98db3b2e3b9bd18d96137b7ca465d9d1c6cb06 /compatibility_matrices | |
| parent | ab52181d73b04e131fd72e32d69b5123a5d6892b (diff) | |
| parent | 54731c3b0cd6337c61fcdabe4603dc9d64f7bf8e (diff) | |
Merge TP1A.220209.001
Change-Id: Ia39c40c82efb5b7c7d2ad4c464b75e6fd4e073aa
Diffstat (limited to 'compatibility_matrices')
| -rw-r--r-- | compatibility_matrices/compatibility_matrix.current.xml | 27 | ||||
| -rw-r--r-- | compatibility_matrices/exclude/fcm_exclude.cpp | 3 |
2 files changed, 22 insertions, 8 deletions
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index 8d37f1897a..e2ed62292e 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml @@ -10,7 +10,7 @@ <hal format="hidl" optional="false"> <name>android.hardware.audio</name> <version>6.0</version> - <version>7.0</version> + <version>7.0-1</version> <interface> <name>IDevicesFactory</name> <instance>default</instance> @@ -187,6 +187,14 @@ <regex-instance>[^/]+/[0-9]+</regex-instance> </interface> </hal> + <hal format="aidl" optional="true"> + <name>android.hardware.camera.provider</name> + <version>1</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.1-2</version> @@ -300,7 +308,10 @@ <instance>default</instance> </interface> </hal> - <hal format="hidl" optional="false"> + <!-- Either the AIDL or the HIDL composer HAL must exist on the device. + If the HIDL composer HAL exists, it must be at least version 2.1. + See DeviceManifestTest.ComposerHal --> + <hal format="hidl" optional="true"> <name>android.hardware.graphics.composer</name> <version>2.1-4</version> <interface> @@ -374,11 +385,11 @@ <instance>default</instance> </interface> </hal> - <hal format="hidl" optional="true"> - <name>android.hardware.input.classifier</name> - <version>1.0</version> + <hal format="aidl" optional="true"> + <name>android.hardware.input.processor</name> + <version>1</version> <interface> - <name>IInputClassifier</name> + <name>IInputProcessor</name> <instance>default</instance> </interface> </hal> @@ -427,7 +438,7 @@ </hal> <hal format="aidl" optional="true"> <name>android.hardware.light</name> - <version>1</version> + <version>2</version> <interface> <name>ILights</name> <instance>default</instance> @@ -503,7 +514,7 @@ </hal> <hal format="aidl" optional="false"> <name>android.hardware.power</name> - <version>1-3</version> + <version>2-3</version> <interface> <name>IPower</name> <instance>default</instance> diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp index 414c502fd7..6de9d03683 100644 --- a/compatibility_matrices/exclude/fcm_exclude.cpp +++ b/compatibility_matrices/exclude/fcm_exclude.cpp @@ -53,6 +53,9 @@ bool ShouldCheckMissingHalsInFcm(const std::string& package) { // AIDL "android.hardware.audio.common", "android.hardware.biometrics.common", + "android.hardware.camera.metadata", + "android.hardware.camera.device", + "android.hardware.camera.common", "android.hardware.common", "android.hardware.common.fmq", "android.hardware.graphics.common", |