Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dead setRingerMode(mode, mask)"

Browse Source
This commit is contained in:
Glenn Kasten
2012-01-20 10:07:06 -08:00
committed by Android (Google) Code Review
parent 1b4d60497c ee7fea9f2f
commit 7524a59252
8 changed files with 1 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_media_AudioSystem.cpp
View File

@@ -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},

1
include/media/AudioSystem.h
View File

@@ -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,

1
include/media/IAudioPolicyService.h
View File

@@ -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,

1
media/java/android/media/AudioSystem.java
View File

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

7
media/libmedia/AudioSystem.cpp
View File

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

20
media/libmedia/IAudioPolicyService.cpp
View File

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

13
services/audioflinger/AudioPolicyService.cpp
View File

@@ -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)
{

1
services/audioflinger/AudioPolicyService.h
View File

@@ -59,7 +59,6 @@ public:
audio_devices_t device,
const char *device_address);
virtual status_t setPhoneState(audio_mode_t state);
virtual status_t setRingerMode(uint32_t mode, uint32_t mask);
virtual status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config);
virtual audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage);
virtual audio_io_handle_t getOutput(audio_stream_type_t stream,