commit 099cdd9ff4a772b3503d165213488921f9acbac3
author Ryanne Cheng <ryannecheng@google.com> Mon Mar 23 01:39:13 2020 +0000
committer Ryanne Cheng <ryannecheng@google.com> Mon Mar 23 01:39:13 2020 +0000
tree 528e67b2d9473b213ebe60d8a9ceef55b2e0ce12
parent d324f84c65b9e7311d4a8afcbf4a9c0eb1c7a6ab

Revert "Check unused HALs on device with target FCM version 5."

Revert "Use HIDL metadata for deprecation check"

Revert submission 10745362-check_unused

Reason for revert: Droidcop: Potential culprit for Bug 152161259
Reverted Changes:
I92cd7ce1c:Use HIDL metadata for deprecation check
I2b9492eec:Fix check deprecation to use Hidl Metadata.
I6e40a49d5:Add no unused hals test
Ia352a979d:Delete unused GNSS@2.0 Thermal@2.0 checks
I1c0ef715b:checkUnusedHals: use hidl metadata
I44a5240e8:Check unused HALs on device with target FCM versio...
I5c5ec4891:Check unused HALs when system ext matrix exists.
I17894c025:Add libhidlmetadata_headers
I2c7cbf8f5:Drop GNSS1.1 and Thermal1.0

Change-Id: I0ca1ef2c0f8cb7e39110d5fb2855987514a1fbce

check_vintf.cpp

diff --git a/check_vintf.cpp b/check_vintf.cpp
index f2a239a..17e32df 100644
--- a/check_vintf.cpp
+++ b/check_vintf.cpp
@@ -374,12 +374,7 @@
     if (!hasFcmExt.has_value()) {
         return hasFcmExt.error();
     }
-    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)) {
+    if (*hasFcmExt) {
         return vintfObject->checkUnusedHals();
     }
     LOG(INFO) << "Skip checking unused HALs.";