mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-03 15:45:10 +00:00
Code Issues Releases Wiki Activity

Mute call button was not working on Android M because of a deprecated API

Browse Source
This commit is contained in:
Albert Vaca
2016-06-02 13:26:19 +02:00
parent 01b5c3e2a1
commit 305d496bf5
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
View File

@@ -25,6 +25,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.telephony.SmsMessage; import android.telephony.SmsMessage;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
@@ -122,7 +123,11 @@ public class TelephonyPlugin extends Plugin {
case TelephonyManager.CALL_STATE_RINGING: case TelephonyManager.CALL_STATE_RINGING:
if (isMuted) { if (isMuted) {
AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
am.setStreamVolume(AudioManager.STREAM_RING, AudioManager.ADJUST_UNMUTE, 0);
} else {
am.setStreamMute(AudioManager.STREAM_RING, false); am.setStreamMute(AudioManager.STREAM_RING, false);
}
isMuted = false; isMuted = false;
} }
np.set("event", "ringing"); np.set("event", "ringing");
@@ -149,7 +154,11 @@ public class TelephonyPlugin extends Plugin {
public void run() { public void run() {
if (isMuted) { if (isMuted) {
AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
am.setStreamVolume(AudioManager.STREAM_RING, AudioManager.ADJUST_UNMUTE, 0);
} else {
am.setStreamMute(AudioManager.STREAM_RING, false); am.setStreamMute(AudioManager.STREAM_RING, false);
}
isMuted = false; isMuted = false;
} }
} }
@@ -227,7 +236,11 @@ public class TelephonyPlugin extends Plugin {
if (np.getString("action").equals("mute")) { if (np.getString("action").equals("mute")) {
if (!isMuted) { if (!isMuted) {
AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
am.setStreamVolume(AudioManager.STREAM_RING, AudioManager.ADJUST_MUTE, 0);
} else {
am.setStreamMute(AudioManager.STREAM_RING, true); am.setStreamMute(AudioManager.STREAM_RING, true);
}
isMuted = true; isMuted = true;
} }
//Log.e("TelephonyPlugin", "mute"); //Log.e("TelephonyPlugin", "mute");