diff options
| author | Venkateshwarlu Domakonda <vdomak@codeaurora.org> | 2014-09-15 17:35:29 +0530 |
|---|---|---|
| committer | Venkateshwarlu Domakonda <vdomak@codeaurora.org> | 2014-09-18 16:22:37 +0530 |
| commit | 2c571ee086f1ccddd9d9ad4e310c328f9f94b571 (patch) | |
| tree | 4c0ba5a359420fa1678c70d7ffb3b80f12b1fee2 /fmapp2/src/com/caf/fmradio/FMRadioService.java | |
| parent | fccef14765bb2cb96406ff515ba9f90f388ef77f (diff) | |
| download | android_hardware_qcom_fm-2c571ee086f1ccddd9d9ad4e310c328f9f94b571.tar.gz android_hardware_qcom_fm-2c571ee086f1ccddd9d9ad4e310c328f9f94b571.tar.bz2 android_hardware_qcom_fm-2c571ee086f1ccddd9d9ad4e310c328f9f94b571.zip | |
Revert "FM: Fix the concurrency issue with FM mute & call scenario"
As the issue with Audio, Fm reverting the change.
This reverts commit bd7146131c46e6f865b935e8e1465574f5b5a585.
Change-Id: I7f60e92989cd5c71e5d7b6f5dfb2ce4e38f850f6
CRs-Fixed: 726545
Diffstat (limited to 'fmapp2/src/com/caf/fmradio/FMRadioService.java')
| -rw-r--r-- | fmapp2/src/com/caf/fmradio/FMRadioService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java index 92ce4ff..2de50e7 100644 --- a/fmapp2/src/com/caf/fmradio/FMRadioService.java +++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java @@ -1058,6 +1058,7 @@ public class FMRadioService extends Service if((TelephonyManager.CALL_STATE_OFFHOOK == state)|| (TelephonyManager.CALL_STATE_RINGING == state)) { boolean bTempSpeaker = mSpeakerPhoneOn; //need to restore SpeakerPhone + boolean bTempMute = mMuted;// need to restore Mute status int bTempCall = mCallStatus;//need to restore call status if (isFmOn() && fmOff()) { if((mServiceInUse) && (mCallbacks != null)) { @@ -1070,10 +1071,12 @@ public class FMRadioService extends Service mResumeAfterCall = true; mSpeakerPhoneOn = bTempSpeaker; mCallStatus = bTempCall; + mMuted = bTempMute; } else if (!mResumeAfterCall) { mResumeAfterCall = false; mSpeakerPhoneOn = bTempSpeaker; mCallStatus = bTempCall; + mMuted = bTempMute; } } else if (state == TelephonyManager.CALL_STATE_IDLE) { @@ -2062,6 +2065,8 @@ public class FMRadioService extends Service boolean bCommandSent=true; if(isMuted()) return bCommandSent; + if(isCallActive()) + return false; AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); Log.d(LOGTAG, "mute:"); if (audioManager != null) @@ -2080,6 +2085,8 @@ public class FMRadioService extends Service boolean bCommandSent=true; if(!isMuted()) return bCommandSent; + if(isCallActive()) + return false; Log.d(LOGTAG, "unMute:"); AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); if (audioManager != null) |