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

Commit 0696400a authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use audio_mode_t consistently"

parents a9b21c5a f78aee70

include/media/AudioSystem.h

+3 −3
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ public: 
    static status_t setStreamMute(audio_stream_type_t stream, bool mute);

    static status_t getStreamMute(audio_stream_type_t stream, bool* mute);



    // set audio mode in audio hardware (see audio_mode_t)

    static status_t setMode(int mode);

    // set audio mode in audio hardware

    static status_t setMode(audio_mode_t mode);



    // returns true in *state if tracks are active on the specified stream or has been active

    // in the past inPastMs milliseconds
@@ -142,7 +142,7 @@ 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(int state);

    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);

include/media/IAudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public: 
    virtual     bool        streamMute(audio_stream_type_t stream) const = 0;



    // set audio mode

    virtual     status_t    setMode(int mode) = 0;

    virtual     status_t    setMode(audio_mode_t mode) = 0;



    // mic mute/state

    virtual     status_t    setMicMute(bool state) = 0;

include/media/IAudioPolicyService.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public: 
                                              const char *device_address) = 0;

    virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                          const char *device_address) = 0;

    virtual status_t setPhoneState(int state) = 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;

media/libmedia/AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ status_t AudioSystem::getStreamMute(audio_stream_type_t stream, bool* mute) 
    return NO_ERROR;

}



status_t AudioSystem::setMode(int mode)

status_t AudioSystem::setMode(audio_mode_t mode)

{

    if (uint32_t(mode) >= AUDIO_MODE_CNT) return BAD_VALUE;

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
@@ -536,7 +536,7 @@ audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t d 
    return aps->getDeviceConnectionState(device, device_address);

}



status_t AudioSystem::setPhoneState(int state)

status_t AudioSystem::setPhoneState(audio_mode_t state)

{

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

    if (aps == 0) return PERMISSION_DENIED;

media/libmedia/IAudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ public: 
        return reply.readInt32();

    }



    virtual status_t setMode(int mode)

    virtual status_t setMode(audio_mode_t mode)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
@@ -786,7 +786,7 @@ status_t BnAudioFlinger::onTransact( 
        } break;

        case SET_MODE: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            int mode = data.readInt32();

            audio_mode_t mode = (audio_mode_t) data.readInt32();

            reply->writeInt32( setMode(mode) );

            return NO_ERROR;

        } break;