| commit | 3155a60c275882396a60f9dc854b3e6c950c916f | [log] [tgz] |
|---|---|---|
| author | Hongguang Chen <hgchen@google.com> | Tue Nov 16 23:32:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 16 23:32:02 2021 +0000 |
| tree | 09d6e7a439872a0885a6a839f1145efda9b15d2d | |
| parent | 52ddca8bdb80d142500a55a91d75f05a5f8bdcdf [diff] | |
| parent | 65d9678e58d5ce97cf3253f2ff4c1b3c8bc1661e [diff] |
Merge "Add blindScan condition to blindScan test" am: 32b4c5025b am: 5376672d34 am: 65d9678e58 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1894144 Change-Id: I21b2d8606ab5296fd78c016b0ac4247c28655875
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; }