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

Commit 6054a776 authored by François Gaffie's avatar François Gaffie Committed by Eric Laurent
Browse files

audiopolicy: engine: remove deprecated APIs 



Test: make

Change-Id: Idfcb060095da92adb286706d4eaf9b9a78a8c61a
Signed-off-by: default avatarFrançois Gaffie <francois.gaffie@renault.com>
parent f579db5a

services/audiopolicy/common/include/RoutingStrategy.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



namespace android {



enum routing_strategy {

    STRATEGY_NONE = -1,

    STRATEGY_MEDIA,

    STRATEGY_PHONE,

    STRATEGY_SONIFICATION,

    STRATEGY_SONIFICATION_RESPECTFUL,

    STRATEGY_DTMF,

    STRATEGY_ENFORCED_AUDIBLE,

    STRATEGY_TRANSMITTED_THROUGH_SPEAKER,

    STRATEGY_ACCESSIBILITY,

    STRATEGY_REROUTING,

    NUM_STRATEGIES

};



}; //namespace android

services/audiopolicy/engine/interface/AudioPolicyManagerInterface.h

+0 −46
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#pragma once



#include <AudioPolicyManagerObserver.h>

#include <RoutingStrategy.h>

#include <media/AudioProductStrategy.h>

#include <policy.h>

#include <Volume.h>
@@ -55,51 +54,6 @@ public: 
     */

    virtual void setObserver(AudioPolicyManagerObserver *observer) = 0;



    /**

     * Get the input device selected for a given input source.

     *

     * @param[in] inputSource to get the selected input device associated to

     *

     * @return selected input device for the given input source, may be none if error.

     *

     * @deprecated use getInputDeviceForAttributes

     */

    virtual audio_devices_t getDeviceForInputSource(audio_source_t inputSource) const = 0;



    /**

     * Get the output device associated to a given strategy.

     *

     * @param[in] stream type for which the selected ouput device is requested.

     *

     * @return selected ouput device for the given strategy, may be none if error.

     *

     * @deprecated use getOutputDeviceForAttributes

     */

    virtual audio_devices_t getDeviceForStrategy(routing_strategy stategy) const = 0;



    /**

     * Get the strategy selected for a given stream type.

     *

     * @param[in] stream: for which the selected strategy followed by is requested.

     *

     * @return strategy to be followed.

     *

     * @deprecated use getOrderedStreams() / getLinkedStreams() to apply operation on stream

     * following same former routing_strategy

     */

    virtual routing_strategy getStrategyForStream(audio_stream_type_t stream) = 0;



    /**

     * Get the strategy selected for a given usage.

     *

     * @param[in] usage to get the selected strategy followed by.

     *

     * @return strategy to be followed.

     *

     * @deprecated use getProductStrategyForAttributes

     */

    virtual routing_strategy getStrategyForUsage(audio_usage_t usage) = 0;



    /**

     * Set the Telephony Mode.

     *

services/audiopolicy/engineconfigurable/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ LOCAL_SRC_FILES := \ 
    src/Engine.cpp \

    src/EngineInstance.cpp \

    src/Stream.cpp \

    src/Strategy.cpp \

    src/Usage.cpp \

    src/InputSource.cpp \

    ../engine/common/src/ProductStrategy.cpp \

    ../engine/common/src/EngineBase.cpp

services/audiopolicy/engineconfigurable/interface/AudioPolicyPluginInterface.h

+0 −57
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#pragma once



#include <policy.h>

#include <RoutingStrategy.h>

#include <EngineDefinition.h>

#include <Volume.h>

#include <system/audio.h>
@@ -37,19 +36,6 @@ namespace android { 
class AudioPolicyPluginInterface

{

public:

    /**

     * Add a strategy to the engine

     *

     * @param[in] name of the strategy to add

     * @param[in] identifier: the numerical value associated to this member. It MUST match either

     *            system/audio.h or system/audio_policy.h enumration value in order to link the

     *            parameter controled by the PFW and the policy manager component.

     *

     * @return NO_ERROR if the strategy has been added successfully, error code otherwise.

     *

     */

    virtual android::status_t addStrategy(const std::string &name, routing_strategy id) = 0;



    /**

     * Add a streams to the engine.

     *
@@ -63,19 +49,6 @@ public: 
     */

    virtual android::status_t addStream(const std::string &name, audio_stream_type_t id) = 0;



    /**

     * Add a usage to the engine

     *

     * @param[in] name of the usage to add

     * @param[in] identifier: the numerical value associated to this member. It MUST match either

     *            system/audio.h or system/audio_policy.h enumration value in order to link the

     *            parameter controled by the PFW and the policy manager component.

     *

     * @return NO_ERROR if the usage has been added successfully, error code otherwise.

     *

     */

    virtual android::status_t addUsage(const std::string &name, audio_usage_t id) = 0;



    /**

     * Add an input source to the engine

     *
@@ -89,26 +62,6 @@ public: 
     */

    virtual android::status_t addInputSource(const std::string &name, audio_source_t id) = 0;



    /**

     * Set the device to be used by a strategy.

     *

     * @param[in] strategy: name of the strategy for which the device to use has to be set

     * @param[in] devices; mask of devices to be used for the given strategy.

     *

     * @return true if the devices were set correclty for this strategy, false otherwise.

     */

    virtual bool setDeviceForStrategy(const routing_strategy &strategy, audio_devices_t devices) = 0;



    /**

     * Set the strategy to be followed by a stream.

     *

     * @param[in] stream: name of the stream for which the strategy to use has to be set

     * @param[in] strategy to follow for the given stream.

     *

     * @return true if the strategy were set correclty for this stream, false otherwise.

     */

    virtual bool setStrategyForStream(const audio_stream_type_t &stream, routing_strategy strategy) = 0;



    /**

     * Set the strategy to be followed by a stream.

     *
@@ -120,16 +73,6 @@ public: 
    virtual bool setVolumeProfileForStream(const audio_stream_type_t &stream,

                                           const audio_stream_type_t &volumeProfile) = 0;



    /**

     * Set the strategy to be followed by a usage.

     *

     * @param[in] usage: name of the usage for which the strategy to use has to be set

     * @param[in] strategy to follow for the given usage.

     *

     * @return true if the strategy were set correclty for this usage, false otherwise.

     */

    virtual bool setStrategyForUsage(const audio_usage_t &usage, routing_strategy strategy) = 0;



    /**

     * Set the input device to be used by an input source.

     *

services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk

+0 −13
Original line number Diff line number Diff line
@@ -112,8 +112,6 @@ PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteri 
PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml

PFW_EDD_FILES := \

        $(LOCAL_PATH)/SettingsNoOutput/device_for_strategies.pfw \

        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \

        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \

        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \

        $(LOCAL_PATH)/Settings/volumes.pfw
@@ -139,17 +137,6 @@ PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrame 
PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criterion_types.xml

PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml

PFW_EDD_FILES := \

        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_sonification.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_sonification_respectful.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_dtmf.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_enforced_audible.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_transmitted_through_speaker.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_accessibility.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_rerouting.pfw \

        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \

        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \

        $(LOCAL_PATH)/SettingsNoInput/device_for_input_source.pfw \

        $(LOCAL_PATH)/Settings/volumes.pfw