From 48952110c7c7b521f616937730e5dddc80e9a56f Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 11 Dec 2017 15:58:47 -0800 Subject: [PATCH 1/2] Revert old matrices back to DR / MR1. legacy/26/27.xml ("old matrices") should not be changed once published. The requirements / HAL usage information are now encompassed in multiple matrices (instead of a single compatibility_matrix.V.xml). For example, the usage of HALs on Shipping FCM Version 26 is: * Required HALs in 26.xml * Using all required + optional HALs in 26.xml/27.xml/... In particular, * Starting at 26.xml (diff legacy 26), gatekeeper is required. * Starting at 27.xml (diff 26 27), - broadcastradio@1.0 => 1.0-1 - introduce cas@1.0 - introduce oemlock@1.0 - power@1.0 => 1.0-1 - radio@1.0 => 1.0-1 - introduce tetheroffload.config@1.0 - introduce tetheroffload.control@1.0 - thermal@1.0 => 1.0-1 - usb@1.0 => 1.0-1 - vibrator@1.0 => 1.0-1 - wifi@1.0 => 1.0-1 - introduce weaver@1.0 - introduce wifi.offload@1.0 health@2.0 and configstore@1.1 is not specified in legacy/26/27.xml, but framework can still use them, since they are introduced in current.xml. Test: boot test Bug: 69861676 Change-Id: I897df6952245a8ce33e1c63264c3970b0483c2f7 Merged-In: I897df6952245a8ce33e1c63264c3970b0483c2f7 --- compatibility_matrix.26.xml | 62 ++++----------------------------- compatibility_matrix.legacy.xml | 62 ++++----------------------------- 2 files changed, 14 insertions(+), 110 deletions(-) diff --git a/compatibility_matrix.26.xml b/compatibility_matrix.26.xml index 5c81f26616..c9b68a8e12 100644 --- a/compatibility_matrix.26.xml +++ b/compatibility_matrix.26.xml @@ -57,7 +57,7 @@ android.hardware.broadcastradio - 1.0-1 + 1.0 IBroadcastRadioFactory default @@ -71,14 +71,6 @@ legacy/0 - - android.hardware.cas - 1.0 - - IMediaCasService - default - - android.hardware.configstore 1.0 @@ -211,17 +203,9 @@ default - - android.hardware.oemlock - 1.0 - - IOemLock - default - - android.hardware.power - 1.0-1 + 1.0 IPower default @@ -229,7 +213,7 @@ android.hardware.radio - 1.0-1 + 1.0 IRadio slot1 @@ -271,25 +255,9 @@ default - - android.hardware.tetheroffload.config - 1.0 - - IOffloadConfig - default - - - - android.hardware.tetheroffload.control - 1.0 - - IOffloadControl - default - - android.hardware.thermal - 1.0-1 + 1.0 IThermal default @@ -313,7 +281,7 @@ android.hardware.usb - 1.0-1 + 1.0 IUsb default @@ -321,7 +289,7 @@ android.hardware.vibrator - 1.0-1 + 1.0 IVibrator default @@ -335,30 +303,14 @@ default - - android.hardware.weaver - 1.0 - - IWeaver - default - - android.hardware.wifi - 1.0-1 + 1.0 IWifi default - - android.hardware.wifi.offload - 1.0 - - IOffload - default - - android.hardware.wifi.supplicant 1.0 diff --git a/compatibility_matrix.legacy.xml b/compatibility_matrix.legacy.xml index 5655fb97d5..ad6d4b93a3 100644 --- a/compatibility_matrix.legacy.xml +++ b/compatibility_matrix.legacy.xml @@ -57,7 +57,7 @@ android.hardware.broadcastradio - 1.0-1 + 1.0 IBroadcastRadioFactory default @@ -71,14 +71,6 @@ legacy/0 - - android.hardware.cas - 1.0 - - IMediaCasService - default - - android.hardware.configstore 1.0 @@ -211,17 +203,9 @@ default - - android.hardware.oemlock - 1.0 - - IOemLock - default - - android.hardware.power - 1.0-1 + 1.0 IPower default @@ -229,7 +213,7 @@ android.hardware.radio - 1.0-1 + 1.0 IRadio slot1 @@ -271,25 +255,9 @@ default - - android.hardware.tetheroffload.config - 1.0 - - IOffloadConfig - default - - - - android.hardware.tetheroffload.control - 1.0 - - IOffloadControl - default - - android.hardware.thermal - 1.0-1 + 1.0 IThermal default @@ -313,7 +281,7 @@ android.hardware.usb - 1.0-1 + 1.0 IUsb default @@ -321,7 +289,7 @@ android.hardware.vibrator - 1.0-1 + 1.0 IVibrator default @@ -335,30 +303,14 @@ default - - android.hardware.weaver - 1.0 - - IWeaver - default - - android.hardware.wifi - 1.0-1 + 1.0 IWifi default - - android.hardware.wifi.offload - 1.0 - - IOffload - default - - android.hardware.wifi.supplicant 1.0 From e6ce990acb924129dcc795dc21df84c1d4cc1e4f Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 11 Dec 2017 16:07:31 -0800 Subject: [PATCH 2/2] Specify FCM Version in compatibility matrices. FCM Version should not be tied to the name of the file. Test: boots Bug: 69636193 Change-Id: Ic199f3f479dfdc3a2309a28dc546d4a79fba2d52 Merged-In: Ic199f3f479dfdc3a2309a28dc546d4a79fba2d52 --- compatibility_matrix.26.xml | 2 +- compatibility_matrix.27.xml | 2 +- compatibility_matrix.current.xml | 2 +- compatibility_matrix.legacy.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compatibility_matrix.26.xml b/compatibility_matrix.26.xml index c9b68a8e12..6ba87c0c8b 100644 --- a/compatibility_matrix.26.xml +++ b/compatibility_matrix.26.xml @@ -1,4 +1,4 @@ - + android.hardware.audio 2.0 diff --git a/compatibility_matrix.27.xml b/compatibility_matrix.27.xml index 5c81f26616..ea8dde887e 100644 --- a/compatibility_matrix.27.xml +++ b/compatibility_matrix.27.xml @@ -1,4 +1,4 @@ - + android.hardware.audio 2.0 diff --git a/compatibility_matrix.current.xml b/compatibility_matrix.current.xml index 56751c342d..5296142ed3 100644 --- a/compatibility_matrix.current.xml +++ b/compatibility_matrix.current.xml @@ -1,4 +1,4 @@ - + android.hardware.audio 2.0 diff --git a/compatibility_matrix.legacy.xml b/compatibility_matrix.legacy.xml index ad6d4b93a3..6792598280 100644 --- a/compatibility_matrix.legacy.xml +++ b/compatibility_matrix.legacy.xml @@ -1,4 +1,4 @@ - + android.hardware.audio 2.0