diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:37:41 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:37:41 +0100 |
| commit | 48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3 (patch) | |
| tree | 140491ed6e10eb1f61cad29c366ad9d7f2ccfbcd /audio | |
| parent | 170e8cf8f0608848e2acb354faf0d2203fb2d08a (diff) | |
| parent | 4ab492610e6f9654a4f51426d5e8f4871b338063 (diff) | |
| download | device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.zip device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.tar.gz device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.tar.bz2 | |
Merge remote-tracking branch 'replicant/replicant-4.2' into replicant-6.0
ril and vibrator do not work
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
cm.mk
i9300.mk
include/telephony/ril.h
init.smdk4x12.rc
overlay/frameworks/base/core/res/res/values/config.xml
system.prop
Diffstat (limited to 'audio')
| -rwxr-xr-x | audio/ril_interface.c | 4 | ||||
| -rwxr-xr-x | audio/ril_interface.h | 2 | ||||
| -rw-r--r-- | audio/silence.wav | bin | 0 -> 326686 bytes |
3 files changed, 3 insertions, 3 deletions
diff --git a/audio/ril_interface.c b/audio/ril_interface.c index 493e438..78e60b2 100755 --- a/audio/ril_interface.c +++ b/audio/ril_interface.c @@ -117,8 +117,8 @@ int ril_open(struct ril_handle *ril) if (!_ril_open_client || !_ril_close_client || !_ril_connect || !_ril_is_connected || !_ril_disconnect || !_ril_set_call_volume || - !_ril_set_call_audio_path || !_ril_set_two_mic_control || !_ril_set_mic_mute || - !_ril_set_call_clock_sync || !_ril_register_unsolicited_handler) { + !_ril_set_call_audio_path || !_ril_set_two_mic_control || !_ril_set_call_clock_sync || + !_ril_register_unsolicited_handler) { ALOGE("Cannot get symbols from '%s'", RIL_CLIENT_LIBPATH); dlclose(ril->handle); return -1; diff --git a/audio/ril_interface.h b/audio/ril_interface.h index 7d4b87e..a5bf480 100755 --- a/audio/ril_interface.h +++ b/audio/ril_interface.h @@ -17,7 +17,7 @@ #ifndef RIL_INTERFACE_H #define RIL_INTERFACE_H -#define RIL_CLIENT_LIBPATH "libsecril-client.so" +#define RIL_CLIENT_LIBPATH "libaudio-ril-interface.so" #define RIL_CLIENT_ERR_SUCCESS 0 #define RIL_CLIENT_ERR_AGAIN 1 diff --git a/audio/silence.wav b/audio/silence.wav Binary files differnew file mode 100644 index 0000000..5fe31d2 --- /dev/null +++ b/audio/silence.wav |