Snap for 11201039 from 50cd79cb5f70bab3440167bce7704f4fbdcad166 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I7fad7ceab4a989faf67d8400462c44554df66d65

3 files changed, 1 insertions, 38 deletions

diff --git a/treble/vintf/SingleManifestTest.cpp b/treble/vintf/SingleManifestTest.cpp
index 9c4baca9..c6e8fbd4 100644
--- a/treble/vintf/SingleManifestTest.cpp
+++ b/treble/vintf/SingleManifestTest.cpp
@@ -641,16 +641,6 @@ static bool CheckAidlVersionMatchesDeclared(sp<IBinder> binder,
   return false;
 }
 
-static bool IsAndroidTvVertical() {
-  return DeviceSupportsFeature("android.software.leanback");
-}
-
-// For Android TV devices that have ThreadNetwork HAL backported, exempt the AIDL
-// frozen requirement.
-static bool IsHalPackageFreezeExempt(const string& package) {
-  return IsAndroidTvVertical() && package == "android.hardware.threadnetwork";
-}
-
 // An AIDL HAL with VINTF stability can only be registered if it is in the
 // manifest. However, we still must manually check that every declared HAL is
 // actually present on the device.
@@ -700,11 +690,7 @@ TEST_P(SingleAidlTest, HalIsServed) {
 
   if (is_aosp) {
     if (!found_hash) {
-      if (IsHalPackageFreezeExempt(package)) {
-        std::cout << "Warning: Interface " << name << " has an unrecognized hash: '"
-                  << hash << "' but the package '" << package
-                  << "' has been exempted from the test.";
-      } else if (is_release || (reliable_version && is_existing)) {
+      if (is_release || (reliable_version && is_existing)) {
         ADD_FAILURE() << "Interface " << name << " has an unrecognized hash: '"
                       << hash << "'. The following hashes are known:\n"
                       << base::Join(hashes, '\n')
diff --git a/treble/vintf/utils.cpp b/treble/vintf/utils.cpp
index 25487595..c749539d 100644
--- a/treble/vintf/utils.cpp
+++ b/treble/vintf/utils.cpp
@@ -167,26 +167,6 @@ Partition PartitionOfType(SchemaType type) {
   return Partition::UNKNOWN;
 }
 
-bool DeviceSupportsFeature(const char *feature) {
-  bool device_supports_feature = false;
-  FILE *p = popen("pm list features", "re");
-  if (!p) {
-    return false;
-  }
-
-  char *line = NULL;
-  size_t len = 0;
-  while (getline(&line, &len, p) > 0) {
-    if (strstr(line, feature)) {
-      device_supports_feature = true;
-      break;
-    }
-  }
-  pclose(p);
-
-  return device_supports_feature;
-}
-
 }  // namespace testing
 }  // namespace vintf
 }  // namespace android
diff --git a/treble/vintf/utils.h b/treble/vintf/utils.h
index fad1b872..cd89e16f 100644
--- a/treble/vintf/utils.h
+++ b/treble/vintf/utils.h
@@ -174,9 +174,6 @@ Partition PartitionOfProcess(int32_t pid);
 // Returns SYSTEM for FRAMEWORK, VENDOR for DEVICE.
 Partition PartitionOfType(SchemaType type);
 
-// Returns true iff the device has the specified feature.
-bool DeviceSupportsFeature(const char* feature);
-
 }  // namespace testing
 }  // namespace vintf