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

Commit 47f2ea6c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10054401 from fe92189e to udc-qpr1-release

Change-Id: Ic48c28e6ac15fa028cfdbbddd155861c64596e62
parents 80cbab20 fe92189e
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -234,6 +234,12 @@ interface IModule {
     * instance previously instantiated using the 'connectExternalDevice'
     * method.
     *
     * The framework will call this method before closing streams and resetting
     * patches. This call can be used by the HAL module to prepare itself to
     * device disconnection. If the HAL module indicates an error after the first
     * call, the framework will call this method once again after closing associated
     * streams and patches.
     *
     * @throws EX_ILLEGAL_ARGUMENT In the following cases:
     *                             - If the port can not be found by the ID.
     *                             - If this is not a connected device port.
+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ const std::vector<Range::BassBoostRange> BassBoostSw::kRanges = {
const Capability BassBoostSw::kCapability = {.range = {BassBoostSw::kRanges}};
const Descriptor BassBoostSw::kDescriptor = {
        .common = {.id = {.type = getEffectTypeUuidBassBoost(),
                          .uuid = getEffectImplUuidBassBoostSw(),
                          .proxy = getEffectImplUuidBassBoostProxy()},
                          .uuid = getEffectImplUuidBassBoostSw()},
                   .flags = {.type = Flags::Type::INSERT,
                             .insert = Flags::Insert::FIRST,
                             .volume = Flags::Volume::CTRL},
+8 −10
Original line number Diff line number Diff line
@@ -88,10 +88,8 @@ const std::vector<Range::EqualizerRange> EqualizerSw::kRanges = {
        MAKE_RANGE(Equalizer, centerFreqMh, std::vector<int>({1}), std::vector<int>({0}))};

const Capability EqualizerSw::kEqCap = {.range = EqualizerSw::kRanges};
const Descriptor EqualizerSw::kDesc = {
        .common = {.id = {.type = getEffectTypeUuidEqualizer(),
                          .uuid = getEffectImplUuidEqualizerSw(),
                          .proxy = getEffectImplUuidEqualizerProxy()},
const Descriptor EqualizerSw::kDesc = {.common = {.id = {.type = getEffectTypeUuidEqualizer(),
                                                         .uuid = getEffectImplUuidEqualizerSw()},
                                                  .flags = {.type = Flags::Type::INSERT,
                                                            .insert = Flags::Insert::FIRST,
                                                            .volume = Flags::Volume::CTRL},
+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

#include <algorithm>
#include <cstddef>
#include <optional>

#define LOG_TAG "AHAL_VirtualizerSw"
#include <Utils.h>
@@ -76,8 +77,7 @@ const Capability VirtualizerSw::kCapability = {

const Descriptor VirtualizerSw::kDescriptor = {
        .common = {.id = {.type = getEffectTypeUuidVirtualizer(),
                          .uuid = getEffectImplUuidVirtualizerSw(),
                          .proxy = getEffectImplUuidVirtualizerProxy()},
                          .uuid = getEffectImplUuidVirtualizerSw()},
                   .flags = {.type = Flags::Type::INSERT,
                             .insert = Flags::Insert::FIRST,
                             .volume = Flags::Volume::CTRL},
+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
#include <aidl/android/hardware/automotive/ivn/EndpointInfo.h>
#include <aidl/android/hardware/automotive/ivn/OccupantZoneInfo.h>
#include <android/binder_auto_utils.h>
#include <json/json.h>
#include <vector>

#include <unordered_map>
@@ -60,7 +61,10 @@ class IvnAndroidDeviceService
            int androidDeviceId,
            aidl::android::hardware::automotive::ivn::EndpointInfo* endpointInfo) override;

    binder_status_t dump(int fd, const char** args, uint32_t numArgs) override;

  private:
    Json::Value mConfigRootNode;
    int mMyDeviceId;
    std::unordered_map<int, DeviceInfo> mDeviceInfoById;
    std::string_view mConfigPath;
Loading