commit 35b9f808ee83f4ecbcd7a5e44e9a66d2a4f42dcf
author Yifan Hong <elsk@google.com> Tue Mar 17 14:08:29 2020 -0700
committer Yifan Hong <elsk@google.com> Thu Mar 19 14:06:29 2020 -0700
tree 62dbc9b198a3542feb213eb0754a5ce6995505ce
parent 238c6dca14934093746029623d0316d5e5d3f931

Check unused HALs on device with target FCM version 5.

On devices with target FCM version >= 5 (released in Android 11 /
Android R), enforce no unused HALs.

Note that the number 5 is hardcoded in check_vintf, not VintfObject;
this ensures the policy (5) is not mixed with mechanism (on-device libvintf).

Test: m check-vintf-all
Bug: 131717099
Bug: 139946509
Change-Id: I44a5240e82b702108196291b9d2458e1f38cf812
Merged-In: I44a5240e82b702108196291b9d2458e1f38cf812

check_vintf.cpp

diff --git a/check_vintf.cpp b/check_vintf.cpp
index 17e32df..f2a239a 100644
--- a/check_vintf.cpp
+++ b/check_vintf.cpp
@@ -374,7 +374,12 @@
     if (!hasFcmExt.has_value()) {
         return hasFcmExt.error();
     }
-    if (*hasFcmExt) {
+    auto deviceManifest = vintfObject->getDeviceHalManifest();
+    if (deviceManifest == nullptr) {
+        return android::base::Error(-NAME_NOT_FOUND) << "No device HAL manifest";
+    }
+    auto targetFcm = deviceManifest->level();
+    if (*hasFcmExt || (targetFcm != Level::UNSPECIFIED && targetFcm >= Level::R)) {
         return vintfObject->checkUnusedHals();
     }
     LOG(INFO) << "Skip checking unused HALs.";