Gitiles
Code Review Sign In
gerrit.twrp.me / android_device_samsung_j5lte / f6c8a1dc44c3648187ed3a979accd2e54b5173a6 / . / patch / patch.diff
blob: 335061e8043a7f8a9021d3b732ab369480724823 [file] [log] [blame]
Zvikomborero VIncent Zvikarambaf7b963d2016-08-26 01:23:26 -0400[diff] [blame]1diff --git a/frameworks/base/data/keyboards/Generic.kl b/frameworks/base/data/keyboards/Generic.kl
2index f10ba96..ae84296 100644
3--- a/frameworks/base/data/keyboards/Generic.kl
4+++ b/frameworks/base/data/keyboards/Generic.kl
5@@ -247,6 +247,9 @@ key 224 BRIGHTNESS_DOWN
6 key 225 BRIGHTNESS_UP
7 key 226 HEADSETHOOK
8
9+# samsung
10+key 254 APP_SWITCH
11+
12 key 256 BUTTON_1
13 key 257 BUTTON_2
14 key 258 BUTTON_3
Zvikomborero VIncent Zvikaramba79e4ffc2016-08-25 01:12:29 -0400[diff] [blame]15diff -ur a/packages/services/Telecomm/src/com/android/server/telecom/CallAudioManager.java b/packages/services/Telecomm/src/com/android/server/telecom/CallAudioManager.java
16--- a/packages/services/Telecomm/src/com/android/server/telecom/CallAudioManager.java Wed Apr 20 08:50:20 2016
17+++ b/packages/services/Telecomm/src/com/android/server/telecom/CallAudioManager.java Thu May 12 01:31:40 2016
18@@ -481,8 +481,18 @@
19
20 Call call = CallsManager.getInstance().getForegroundCall();
21 boolean setMsimAudioParams = SystemProperties.getBoolean("ro.multisim.set_audio_params", false);
22+ boolean setSamsungRealcallParams = SystemProperties.getBoolean("ro.telephony.samsung.realcall", false);
23
24 Log.v(this, "Request to change audio mode from %d to %d", oldMode, newMode);
25+
26+ if(setSamsungRealcallParams) {
27+ if(newMode == 0) {
28+ mAudioManager.setParameters("realcall=off");
29+ } else if(newMode == AudioManager.MODE_IN_COMMUNICATION || newMode == AudioManager.MODE_RINGTONE
30+ || newMode == AudioManager.MODE_IN_CALL) {
31+ mAudioManager.setParameters("realcall=on");
32+ }
33+ }
34
35 if (oldMode != newMode) {
36 if (oldMode == AudioManager.MODE_IN_CALL && newMode == AudioManager.MODE_RINGTONE) {
37
38diff -ur a/hardware/qcom/fm/fmapp2/src/com/caf/fmradio/FMRadioService.java b/hardware/qcom/fm/fmapp2/src/com/caf/fmradio/FMRadioService.java
39--- a/hardware/qcom/fm/fmapp2/src/com/caf/fmradio/FMRadioService.java Mon Jun 20 17:28:46 2016
40+++ b/hardware/qcom/fm/fmapp2/src/com/caf/fmradio/FMRadioService.java Mon Jun 27 10:45:01 2016
41@@ -926,9 +926,19 @@
42 mSpeakerPhoneOn = true;
43 Log.d(LOGTAG, "Audio source set it as speaker");
44 AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_SPEAKER);
45+ mAudioManager.setParameters("fm_mode=on");
46+ mAudioManager.setParameters("fm_radio_volume=on");
47+ mAudioManager.setParameters("FMRadioVol=0.1496235728");
48+ mAudioManager.setMode(AudioManager.MODE_IN_CALL);
49+ mAudioManager.setSpeakerphoneOn(true);
50 } else {
51 Log.d(LOGTAG, "Audio source set it as headset");
52 AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
53+ mAudioManager.setParameters("fm_mode=on");
54+ mAudioManager.setParameters("fm_radio_volume=on");
55+ mAudioManager.setParameters("FMRadioVol=0.1496235728");
56+ mAudioManager.setMode(AudioManager.MODE_IN_CALL);
57+ mAudioManager.setSpeakerphoneOn(false);
58 }
59 AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_FM,
60 AudioSystem.DEVICE_STATE_AVAILABLE, "");
61@@ -947,6 +957,8 @@
62 stopA2dpPlayback();
63 }else{
64 Log.d(LOGTAG, "FMRadio: Requesting to stop FM");
65+ mAudioManager.setParameters("fm_mode=off");
66+ mAudioManager.setParameters("fm_radio_mute=1");
67 AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_FM,
68 AudioSystem.DEVICE_STATE_UNAVAILABLE, "");
69 }
70@@ -960,6 +972,8 @@
71 resetA2dpPlayback();
72 }else{
73 Log.d(LOGTAG, "FMRadio: Requesting to stop FM");
74+ mAudioManager.setParameters("fm_mode=off");
75+ mAudioManager.setParameters("fm_radio_mute=1");
76 AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_FM,
77 AudioSystem.DEVICE_STATE_UNAVAILABLE, "");
78 sendRecordServiceIntent(RECORD_STOP);
79@@ -1168,6 +1182,7 @@
80 if (audioManager != null) {
81 Log.d(LOGTAG, "Mute");
82 mMuted = true;
83+ audioManager.setParameters("fm_radio_mute=1");
84 audioManager.setStreamMute(AudioManager.STREAM_MUSIC,true);
85 }
86 }
87@@ -2095,6 +2110,7 @@
88 stopRecording();
89 stopFM();
90 AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
91+ mAudioManager.setSpeakerphoneOn(false);
92 if (mMuted) {
93 setAudioPath(true);
94 } else {
95@@ -2104,6 +2120,7 @@
96 }
97 } else {
98 AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
99+ mAudioManager.setSpeakerphoneOn(false);
100 }
101 if (analogmode)
102 startFM();
103@@ -2131,6 +2148,7 @@
104 }
105 }
106 AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_SPEAKER);
107+ mAudioManager.setSpeakerphoneOn(true);
108 if (analogmode)
109 startFM();
110 }
111@@ -2231,6 +2249,7 @@
112 if (audioManager != null)
113 {
114 mMuted = true;
115+ audioManager.setParameters("fm_radio_mute=1");
116 audioManager.setStreamMute(AudioManager.STREAM_MUSIC,true);
117 }
118 return bCommandSent;
119@@ -2251,6 +2270,7 @@
120 if (audioManager != null)
121 {
122 mMuted = false;
123+ audioManager.setParameters("fm_radio_mute=0");
124 audioManager.setStreamMute(AudioManager.STREAM_MUSIC,false);
125 if (mResumeAfterCall)
126 {
127