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

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

Merge "Remove dead setRingerMode(mode, mask)"

parents 1b4d6049 ee7fea9f

core/jni/android_media_AudioSystem.cpp

+0 −7
Original line number Diff line number Diff line
@@ -154,12 +154,6 @@ android_media_AudioSystem_setPhoneState(JNIEnv *env, jobject thiz, jint state) 
    return check_AudioSystem_Command(AudioSystem::setPhoneState((audio_mode_t) state));

}



static int

android_media_AudioSystem_setRingerMode(JNIEnv *env, jobject thiz, jint mode, jint mask)

{

    return check_AudioSystem_Command(AudioSystem::setRingerMode(mode, mask));

}



static int

android_media_AudioSystem_setForceUse(JNIEnv *env, jobject thiz, jint usage, jint config)

{
@@ -227,7 +221,6 @@ static JNINativeMethod gMethods[] = { 
    {"setDeviceConnectionState", "(IILjava/lang/String;)I", (void *)android_media_AudioSystem_setDeviceConnectionState},

    {"getDeviceConnectionState", "(ILjava/lang/String;)I",  (void *)android_media_AudioSystem_getDeviceConnectionState},

    {"setPhoneState",       "(I)I",     (void *)android_media_AudioSystem_setPhoneState},

    {"setRingerMode",       "(II)I",    (void *)android_media_AudioSystem_setRingerMode},

    {"setForceUse",         "(II)I",    (void *)android_media_AudioSystem_setForceUse},

    {"getForceUse",         "(I)I",     (void *)android_media_AudioSystem_getForceUse},

    {"initStreamVolume",    "(III)I",   (void *)android_media_AudioSystem_initStreamVolume},

include/media/AudioSystem.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,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/java/android/media/AudioSystem.java

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ public class AudioSystem 
    public static native int setDeviceConnectionState(int device, int state, String device_address);

    public static native int getDeviceConnectionState(int device, String device_address);

    public static native int setPhoneState(int state);

    public static native int setRingerMode(int mode, int mask);

    public static native int setForceUse(int usage, int config);

    public static native int getForceUse(int usage);

    public static native int initStreamVolume(int stream, int indexMin, int indexMax);

media/libmedia/AudioSystem.cpp

+0 −7
Original line number Diff line number Diff line
@@ -555,13 +555,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();