Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c90461c7 authored by Steven Moreland's avatar Steven Moreland
Browse files

rename hidl_enum_{iterator,range} 

This is actually a range, not an iterator.

Bug: 78573628
Test: m
Change-Id: Ie824a3eabcb7d5af94a8752e1498bdc8c7032e40
parent a81cd5b4

audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ using std::vector; 
using ::android::sp;

using ::android::hardware::Return;

using ::android::hardware::hidl_bitfield;

using ::android::hardware::hidl_enum_iterator;

using ::android::hardware::hidl_enum_range;

using ::android::hardware::hidl_handle;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;
@@ -1074,7 +1074,7 @@ TEST_P(InputStreamTest, getCapturePosition) { 
TEST_P(InputStreamTest, updateSinkMetadata) {

    doc::test("The HAL should not crash on metadata change");



    hidl_enum_iterator<AudioSource> range;

    hidl_enum_range<AudioSource> range;

    // Test all possible track configuration

    for (AudioSource source : range) {

        for (float volume : {0.0, 0.5, 1.0}) {
@@ -1326,8 +1326,8 @@ TEST_P(OutputStreamTest, SelectPresentation) { 
TEST_P(OutputStreamTest, updateSourceMetadata) {

    doc::test("The HAL should not crash on metadata change");



    hidl_enum_iterator<AudioUsage> usageRange;

    hidl_enum_iterator<AudioContentType> contentRange;

    hidl_enum_range<AudioUsage> usageRange;

    hidl_enum_range<AudioContentType> contentRange;

    // Test all possible track configuration

    for (auto usage : usageRange) {

        for (auto content : contentRange) {

automotive/audiocontrol/1.0/vts/functional/VtsHalAudioControlV1_0TargetTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
using namespace ::android::hardware::automotive::audiocontrol::V1_0;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::hardware::hidl_enum_iterator;

using ::android::hardware::hidl_enum_range;

using ::android::hardware::hidl_handle;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;
@@ -132,7 +132,7 @@ TEST_F(CarAudioControlHidlTest, ContextMapping) { 
    int bus = -1;



    // For each defined context, query the driver for the BUS on which it should be delivered

    for (const auto& ctxt : hidl_enum_iterator<ContextNumber>()) {

    for (const auto& ctxt : hidl_enum_range<ContextNumber>()) {

         bus = pAudioControl->getBusForContext(ctxt);



         if (ctxt == ContextNumber::INVALID) {
@@ -147,8 +147,8 @@ TEST_F(CarAudioControlHidlTest, ContextMapping) { 
    }



    // Try asking about an invalid context one beyond the last defined to see that it gets back a -1

    int contextRange = std::distance(hidl_enum_iterator<ContextNumber>().begin(),

                                     hidl_enum_iterator<ContextNumber>().end());

    int contextRange = std::distance(hidl_enum_range<ContextNumber>().begin(),

                                     hidl_enum_range<ContextNumber>().end());

    bus = pAudioControl->getBusForContext((ContextNumber)contextRange);

    EXPECT_EQ(bus, -1);

camera/device/3.4/default/ExternalCameraDeviceSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2727,7 +2727,7 @@ status_t ExternalCameraDeviceSession::initDefaultRequests() { 
    const uint8_t controlMode = ANDROID_CONTROL_MODE_AUTO;

    UPDATE(md, ANDROID_CONTROL_MODE, &controlMode, 1);



    auto requestTemplates = hidl_enum_iterator<RequestTemplate>();

    auto requestTemplates = hidl_enum_range<RequestTemplate>();

    for (RequestTemplate type : requestTemplates) {

        ::android::hardware::camera::common::V1_0::helper::CameraMetadata mdCopy = md;

        uint8_t intent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;

health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ bool verifyStorageInfo(const hidl_vec<struct StorageInfo>& info) { 


template <typename T>

bool verifyEnum(T value) {

    for (auto it : hidl_enum_iterator<T>()) {

    for (auto it : hidl_enum_range<T>()) {

        if (it == value) {

            return true;

        }

vibrator/1.2/vts/functional/VtsHalVibratorV1_2TargetTest.cpp

+7 −7
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ using ::android::hardware::vibrator::V1_0::Status; 
using ::android::hardware::vibrator::V1_0::EffectStrength;

using ::android::hardware::vibrator::V1_2::Effect;

using ::android::hardware::vibrator::V1_2::IVibrator;

using ::android::hardware::hidl_enum_iterator;

using ::android::hardware::hidl_enum_range;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::sp;
@@ -86,8 +86,8 @@ static void validatePerformEffectBadInput(Status status, uint32_t lengthMs) { 
 * a valid duration, or are unsupported and return UNSUPPORTED_OPERATION with a duration of 0.

 */

TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2) {

    for (const auto& effect : hidl_enum_iterator<Effect>()) {

        for (const auto& strength : hidl_enum_iterator<EffectStrength>()) {

    for (const auto& effect : hidl_enum_range<Effect>()) {

        for (const auto& strength : hidl_enum_range<EffectStrength>()) {

            EXPECT_OK(vibrator->perform_1_2(effect, strength, validatePerformEffect));

        }

    }
@@ -97,7 +97,7 @@ TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2) { 
 * Test to make sure effect values above the valid range are rejected.

 */

TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2_BadEffects_AboveValidRange) {

    Effect effect = *std::prev(hidl_enum_iterator<Effect>().end());

    Effect effect = *std::prev(hidl_enum_range<Effect>().end());

    Effect badEffect = static_cast<Effect>(static_cast<int32_t>(effect) + 1);

    EXPECT_OK(

        vibrator->perform_1_2(badEffect, EffectStrength::LIGHT, validatePerformEffectBadInput));
@@ -107,7 +107,7 @@ TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2_BadEffects_AboveValidRange) { 
 * Test to make sure effect values below the valid range are rejected.

 */

TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2_BadEffects_BelowValidRange) {

    Effect effect = *hidl_enum_iterator<Effect>().begin();

    Effect effect = *hidl_enum_range<Effect>().begin();

    Effect badEffect = static_cast<Effect>(static_cast<int32_t>(effect) - 1);

    EXPECT_OK(

        vibrator->perform_1_2(badEffect, EffectStrength::LIGHT, validatePerformEffectBadInput));
@@ -117,7 +117,7 @@ TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2_BadEffects_BelowValidRange) { 
 * Test to make sure strength values above the valid range are rejected.

 */

TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2_BadStrength_AboveValidRange) {

    EffectStrength strength = *std::prev(hidl_enum_iterator<EffectStrength>().end());

    EffectStrength strength = *std::prev(hidl_enum_range<EffectStrength>().end());

    EffectStrength badStrength = static_cast<EffectStrength>(static_cast<int32_t>(strength) + 1);

    EXPECT_OK(vibrator->perform_1_2(Effect::THUD, badStrength, validatePerformEffectBadInput));

}
@@ -126,7 +126,7 @@ TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2_BadStrength_AboveValidRange) { 
 * Test to make sure strength values below the valid range are rejected.

 */

TEST_F(VibratorHidlTest_1_2, PerformEffect_1_2_BadStrength_BelowValidRange) {

    EffectStrength strength = *hidl_enum_iterator<EffectStrength>().begin();

    EffectStrength strength = *hidl_enum_range<EffectStrength>().begin();

    EffectStrength badStrength = static_cast<EffectStrength>(static_cast<int32_t>(strength) - 1);

    EXPECT_OK(vibrator->perform_1_2(Effect::THUD, badStrength, validatePerformEffectBadInput));

}