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

Commit c0be4b07 authored by Bao Do's avatar Bao Do Committed by Automerger Merge Worker
Browse files

Merge "Fix broken failure condition when populating ase configurtion." into... 

Merge "Fix broken failure condition when populating ase configurtion." into main am: 358509c1 am: 17d28958

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3448929



Change-Id: I904f301b280291daa885f24dfe8857fb8225645d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4da126f 17d28958

bluetooth/audio/utils/aidl_session/BluetoothLeAudioAseConfigurationSettingProvider.cpp

+7 −7
Original line number Diff line number Diff line
@@ -674,17 +674,17 @@ void AudioSetConfigurationProviderJson::PopulateAseConfigurationFromFlat( 
        configurationFlags.bitmask |=

            ConfigurationFlags::ALLOW_ASYMMETRIC_CONFIGURATIONS;

      }

    }

  } else {

    if (codec_cfg == nullptr) {

        LOG(ERROR) << "No codec config matching key "

                   << codec_config_key.c_str() << " found";

      LOG(ERROR) << "No codec config matching key " << codec_config_key.c_str()

                 << " found";

    } else {

      LOG(ERROR) << "Configuration '" << flat_cfg->name()->c_str()

                 << "' has no valid subconfigurations.";

    }

  }

}

}



bool AudioSetConfigurationProviderJson::LoadConfigurationsFromFiles(

    const char* schema_file, const char* content_file, CodecLocation location) {