diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-15 23:21:28 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-15 23:21:28 +0000 |
commit | e5f5a21481003db317edd03f240340cf1dc3b06f (patch) | |
tree | 65780e0347ae528a38489387cf35b9d950b2a46f | |
parent | 4bca11e5cc5332fcd2f6f0cc9dd1c7ecc7f55f00 (diff) | |
parent | fd4bd65f310dc95b4fad9d58f64ecb660951e4f8 (diff) | |
download | interfaces-e5f5a21481003db317edd03f240340cf1dc3b06f.tar.gz |
Snap for 9752887 from fd4bd65f310dc95b4fad9d58f64ecb660951e4f8 to tm-qpr3-release
Change-Id: I57ff1787b64fcb50c46c857a7fd1c3be3b85cdf7
-rw-r--r-- | radio/1.5/vts/functional/radio_hidl_hal_api.cpp | 15 | ||||
-rw-r--r-- | radio/aidl/vts/radio_network_test.cpp | 11 | ||||
-rw-r--r-- | tv/tuner/1.0/vts/functional/DvrTests.cpp | 1 | ||||
-rw-r--r-- | tv/tuner/config/TunerTestingConfigReaderV1_0.h | 9 |
4 files changed, 28 insertions, 8 deletions
diff --git a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp index 152858f6a8..5994d880d6 100644 --- a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp @@ -595,12 +595,17 @@ TEST_P(RadioHidlTest_v1_5, startNetworkScan) { if (cardStatus.base.base.base.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::SIM_ABSENT})); } else if (cardStatus.base.base.base.cardState == CardState::PRESENT) { - // OPERATION_NOT_ALLOWED should not be allowed; however, some vendors do - // not support the required manual GSM search functionality. This is - // tracked in b/112206766. Modems have "GSM" rat scan need to + // Modems have "GSM" rat scan need to // support scanning requests combined with some parameters. - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, - {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED})); + if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) { + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, + {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED})); + } else { + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_5->rspInfo.error, + {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::INVALID_ARGUMENTS})); + } } if (radioRsp_v1_5->rspInfo.error == RadioError::NONE) { diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp index c83571ee0a..679d6c7796 100644 --- a/radio/aidl/vts/radio_network_test.cpp +++ b/radio/aidl/vts/radio_network_test.cpp @@ -862,8 +862,15 @@ TEST_P(RadioNetworkTest, startNetworkScan) { // not support the required manual GSM search functionality. This is // tracked in b/112206766. Modems have "GSM" rat scan need to // support scanning requests combined with some parameters. - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED})); + if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) { + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED})); + } else { + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED, RadioError::NONE, + RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + } } if (radioRsp_network->rspInfo.error == RadioError::NONE) { diff --git a/tv/tuner/1.0/vts/functional/DvrTests.cpp b/tv/tuner/1.0/vts/functional/DvrTests.cpp index 83f98584fb..cab5867840 100644 --- a/tv/tuner/1.0/vts/functional/DvrTests.cpp +++ b/tv/tuner/1.0/vts/functional/DvrTests.cpp @@ -203,7 +203,6 @@ bool DvrCallback::readRecordFMQ() { void DvrCallback::stopRecordThread() { mKeepReadingRecordFMQ = false; mRecordThreadRunning = false; - android::Mutex::Autolock autoLock(mRecordThreadLock); } AssertionResult DvrTests::openDvrInDemux(DvrType type, uint32_t bufferSize) { diff --git a/tv/tuner/config/TunerTestingConfigReaderV1_0.h b/tv/tuner/config/TunerTestingConfigReaderV1_0.h index d049b07232..fb76de7af4 100644 --- a/tv/tuner/config/TunerTestingConfigReaderV1_0.h +++ b/tv/tuner/config/TunerTestingConfigReaderV1_0.h @@ -65,6 +65,7 @@ using android::hardware::tv::tuner::V1_0::LnbTone; using android::hardware::tv::tuner::V1_0::LnbVoltage; using android::hardware::tv::tuner::V1_0::PlaybackSettings; using android::hardware::tv::tuner::V1_0::RecordSettings; +using android::hardware::tv::tuner::V1_0::FrontendAtscSettings; const string emptyHardwareId = ""; @@ -241,6 +242,7 @@ struct TunerTestingConfigReader1_0 { break; case FrontendTypeEnum::ATSC: type = FrontendType::ATSC; + frontendMap[id].settings.atsc(readAtscFrontendSettings(feConfig)); break; case FrontendTypeEnum::ATSC3: type = FrontendType::ATSC3; @@ -627,6 +629,13 @@ struct TunerTestingConfigReader1_0 { return dvbsSettings; } + static FrontendAtscSettings readAtscFrontendSettings(Frontend feConfig) { + FrontendAtscSettings atscSettings{ + .frequency = (uint32_t)feConfig.getFrequency(), + }; + return atscSettings; + } + static bool readFilterTypeAndSettings(Filter filterConfig, DemuxFilterType& type, DemuxFilterSettings& settings) { auto mainType = filterConfig.getMainType(); |