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

Commit 0b07b808 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Remove dead setRingerMode(mode, mask) 

Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
parent 04eaf3e5

include/media/AudioSystem.h

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ public: 
    static status_t setDeviceConnectionState(audio_devices_t device, audio_policy_dev_state_t state, const char *device_address);

    static audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device, const char *device_address);

    static status_t setPhoneState(audio_mode_t state);

    static status_t setRingerMode(uint32_t mode, uint32_t mask);

    static status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config);

    static audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage);

    static audio_io_handle_t getOutput(audio_stream_type_t stream,

include/media/IAudioPolicyService.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ public: 
    virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                          const char *device_address) = 0;

    virtual status_t setPhoneState(audio_mode_t state) = 0;

    virtual status_t setRingerMode(uint32_t mode, uint32_t mask) = 0;

    virtual status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config) = 0;

    virtual audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage) = 0;

    virtual audio_io_handle_t getOutput(audio_stream_type_t stream,

media/libmedia/AudioSystem.cpp

+0 −7
Original line number Diff line number Diff line
@@ -544,13 +544,6 @@ status_t AudioSystem::setPhoneState(audio_mode_t state) 
    return aps->setPhoneState(state);

}



status_t AudioSystem::setRingerMode(uint32_t mode, uint32_t mask)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;

    return aps->setRingerMode(mode, mask);

}



status_t AudioSystem::setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

media/libmedia/IAudioPolicyService.cpp

+1 −19
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ enum { 
    SET_DEVICE_CONNECTION_STATE = IBinder::FIRST_CALL_TRANSACTION,

    GET_DEVICE_CONNECTION_STATE,

    SET_PHONE_STATE,

    SET_RINGER_MODE,

    SET_RINGER_MODE,    // reserved, no longer used

    SET_FORCE_USE,

    GET_FORCE_USE,

    GET_OUTPUT,
@@ -100,16 +100,6 @@ public: 
        return static_cast <status_t> (reply.readInt32());

    }



    virtual status_t setRingerMode(uint32_t mode, uint32_t mask)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());

        data.writeInt32(mode);

        data.writeInt32(mask);

        remote()->transact(SET_RINGER_MODE, data, &reply);

        return static_cast <status_t> (reply.readInt32());

    }



    virtual status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config)

    {

        Parcel data, reply;
@@ -405,14 +395,6 @@ status_t BnAudioPolicyService::onTransact( 
            return NO_ERROR;

        } break;



        case SET_RINGER_MODE: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            uint32_t mode = data.readInt32();

            uint32_t mask = data.readInt32();

            reply->writeInt32(static_cast <uint32_t>(setRingerMode(mode, mask)));

            return NO_ERROR;

        } break;



        case SET_FORCE_USE: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            audio_policy_force_use_t usage = static_cast <audio_policy_force_use_t>(data.readInt32());

services/audioflinger/AudioPolicyService.cpp

+0 −13
Original line number Diff line number Diff line
@@ -207,19 +207,6 @@ status_t AudioPolicyService::setPhoneState(audio_mode_t state) 
    return NO_ERROR;

}



status_t AudioPolicyService::setRingerMode(uint32_t mode, uint32_t mask)

{

    if (mpAudioPolicy == NULL) {

        return NO_INIT;

    }

    if (!checkPermission()) {

        return PERMISSION_DENIED;

    }



    mpAudioPolicy->set_ringer_mode(mpAudioPolicy, mode, mask);

    return NO_ERROR;

}



status_t AudioPolicyService::setForceUse(audio_policy_force_use_t usage,

                                         audio_policy_forced_cfg_t config)

{