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

Commit 95660331 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by android-build-merger
Browse files

Merge "Workaround HAL 1.1 program list fetching limitation by preferring FM." into pi-dev 

am: 86021cff

Change-Id: I8381abef3d03ba9ebb872d9d8ae23a2ea9533631
parents 6d1e48c2 86021cff

services/core/jni/BroadcastRadio/BroadcastRadioService.cpp

+7 −0
Original line number Diff line number Diff line
@@ -231,6 +231,13 @@ static jobject nativeOpenTuner(JNIEnv *env, jobject obj, long nativeContext, jin 
            return nullptr;

        }

        bandConfigHal = module.bands[0];



        /* Prefer FM to workaround possible program list fetching limitation

         * (if tuner scans only configured band for programs). */

        auto fmIt = std::find_if(module.bands.begin(), module.bands.end(),

            [](const BandConfig & band) { return utils::isFm(band.type); });

        if (fmIt != module.bands.end()) bandConfigHal = *fmIt;



        if (bandConfigHal.spacings.size() > 1) {

            bandConfigHal.spacings = hidl_vec<uint32_t>({ *std::min_element(

                    bandConfigHal.spacings.begin(), bandConfigHal.spacings.end()) });