Merge "Patched <1 resolution bug in reference VHAL" into main

This commit is contained in:
Treehugger Robot
2024-05-28 19:43:08 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 1 deletions

View File

@@ -40,6 +40,7 @@ using ::android::base::Result;
using ::android::base::StringPrintf;
using ::ndk::ScopedAStatus;
constexpr float EPSILON = 0.0000001;
constexpr float ONE_SECOND_IN_NANOS = 1'000'000'000.;
SubscribeOptions newSubscribeOptions(int32_t propId, int32_t areaId, float sampleRateHz,
@@ -88,7 +89,7 @@ bool SubscriptionManager::checkResolution(float resolution) {
}
float log = std::log10(resolution);
return log == (int)log;
return std::abs(log - std::round(log)) < EPSILON;
}
void ContSubConfigs::refreshCombinedConfig() {

View File

@@ -521,6 +521,8 @@ TEST_F(SubscriptionManagerTest, testCheckSampleRateHzInvalidZero) {
}
TEST_F(SubscriptionManagerTest, testCheckResolutionValid) {
ASSERT_TRUE(SubscriptionManager::checkResolution(0.0));
ASSERT_TRUE(SubscriptionManager::checkResolution(0.1));
ASSERT_TRUE(SubscriptionManager::checkResolution(1.0));
}