| commit | 5376672d3400d01e7ab3cf22e0f688fa402c08a6 | [log] [tgz] |
|---|---|---|
| author | Hongguang Chen <hgchen@google.com> | Tue Nov 16 22:58:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 16 22:58:20 2021 +0000 |
| tree | c3e280dec9b421c13b66c656ab8649738b5bbd1f | |
| parent | bd2c32ba66e82488107486461431ce5efacfab1f [diff] | |
| parent | 32b4c5025b1c88ae8d66f5319da94e0d38b82809 [diff] |
Merge "Add blindScan condition to blindScan test" am: 32b4c5025b Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1894144 Change-Id: I3a2c6ae5b8997800fba3ac673a8437b86ffeaaca
diff --git a/tv/tuner/1.0/vts/functional/FrontendTests.cpp b/tv/tuner/1.0/vts/functional/FrontendTests.cpp index b35d112..6cf7d1d 100644 --- a/tv/tuner/1.0/vts/functional/FrontendTests.cpp +++ b/tv/tuner/1.0/vts/functional/FrontendTests.cpp
@@ -128,7 +128,8 @@ } EXPECT_TRUE(scanMsgLockedReceived) << "Scan message LOCKED not received before END"; - EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; + if (type == FrontendScanType::SCAN_BLIND) + EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; mScanMessageReceived = false; mScanMsgProcessed = true; }
diff --git a/tv/tuner/1.1/vts/functional/FrontendTests.cpp b/tv/tuner/1.1/vts/functional/FrontendTests.cpp index 9c575ff..7afffb8 100644 --- a/tv/tuner/1.1/vts/functional/FrontendTests.cpp +++ b/tv/tuner/1.1/vts/functional/FrontendTests.cpp
@@ -180,7 +180,8 @@ } EXPECT_TRUE(scanMsgLockedReceived) << "Scan message LOCKED not received before END"; - EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; + if (type == FrontendScanType::SCAN_BLIND) + EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; mScanMessageReceived = false; mScanMsgProcessed = true; }