commit 7e669ce5771e8a5af1278779048d4baea17f83ce
author Amy Zhang <amyjojo@google.com> Tue Oct 20 16:41:30 2020 -0700
committer Amy Zhang <amyjojo@google.com> Thu Oct 22 15:55:02 2020 -0700
tree faf948ff987b070b63213993fcdc5e374ef95694
parent 12f66020d5b012bbb4aedae85defd20d276a9e6c

Add new Frontend Status Types and a new scan msg in Tuner HAL 1.1

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 169868608
Change-Id: I04b108bab20e6a1969998bb954e48c2f1c5e0772

tv/tuner/1.1/vts/functional/FrontendTests.cpp

diff --git a/tv/tuner/1.1/vts/functional/FrontendTests.cpp b/tv/tuner/1.1/vts/functional/FrontendTests.cpp
index e5793c1..0948f74 100644
--- a/tv/tuner/1.1/vts/functional/FrontendTests.cpp
+++ b/tv/tuner/1.1/vts/functional/FrontendTests.cpp
@@ -58,6 +58,9 @@
         case FrontendScanMessageExt1_1::hidl_discriminator::isHighPriority:
             ALOGD("[vts] frontend ext1_1 scan message high priority: %d", message.isHighPriority());
             break;
+        case FrontendScanMessageExt1_1::hidl_discriminator::annex:
+            ALOGD("[vts] frontend ext1_1 scan message dvbc annex: %hhu", message.annex());
+            break;
         default:
             break;
     }
@@ -374,6 +377,22 @@
                                        expectStatuses[i].tsDataRate().begin()));
                 break;
             }
+            case FrontendStatusTypeExt1_1::ROLL_OFF: {
+                // TODO: verify roll off
+                break;
+            }
+            case FrontendStatusTypeExt1_1::IS_MISO: {
+                ASSERT_TRUE(realStatuses[i].isMiso() == expectStatuses[i].isMiso());
+                break;
+            }
+            case FrontendStatusTypeExt1_1::IS_LINEAR: {
+                ASSERT_TRUE(realStatuses[i].isLinear() == expectStatuses[i].isLinear());
+                break;
+            }
+            case FrontendStatusTypeExt1_1::IS_SHORT_FRAMES: {
+                ASSERT_TRUE(realStatuses[i].isShortFrames() == expectStatuses[i].isShortFrames());
+                break;
+            }
             default: {
                 continue;
             }

tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TestConfigurations.h

diff --git a/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TestConfigurations.h b/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TestConfigurations.h
index cb86ce8..911d984 100644
--- a/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TestConfigurations.h
+++ b/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TestConfigurations.h
@@ -138,10 +138,14 @@
     frontendArray[DVBT].type = FrontendType::DVBT, frontendArray[DVBT].settings.dvbt(dvbtSettings);
     vector<FrontendStatusTypeExt1_1> types;
     types.push_back(FrontendStatusTypeExt1_1::UEC);
+    types.push_back(FrontendStatusTypeExt1_1::IS_MISO);
+    vector<FrontendStatusExt1_1> statuses;
     FrontendStatusExt1_1 status;
     status.uec(4);
-    vector<FrontendStatusExt1_1> statuses;
     statuses.push_back(status);
+    status.isMiso(true);
+    statuses.push_back(status);
+
     frontendArray[DVBT].tuneStatusTypes = types;
     frontendArray[DVBT].expectTuneStatuses = statuses;
     frontendArray[DVBT].isSoftwareFe = true;