diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-08-20 07:32:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-08-20 07:32:20 -0700 |
| commit | 4293b818dee0d2ef2797f1a05f3219ca9ed9114b (patch) | |
| tree | 900f8357d5a06de1e980bd1bdcca7475a916ce74 | |
| parent | 50ea179dbfdf33712350d05c10f7830e98547c53 (diff) | |
| parent | 81c82e15452fb9bf9a35389c07edb9afa0e92fd3 (diff) | |
| download | android_hardware_qcom_fm-4293b818dee0d2ef2797f1a05f3219ca9ed9114b.tar.gz android_hardware_qcom_fm-4293b818dee0d2ef2797f1a05f3219ca9ed9114b.tar.bz2 android_hardware_qcom_fm-4293b818dee0d2ef2797f1a05f3219ca9ed9114b.zip | |
Merge "FM: Fix the concurrency issue with FM mute & call scenario"
| -rw-r--r-- | fmapp2/src/com/caf/fmradio/FMRadioService.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java index 2de50e7..92ce4ff 100644 --- a/fmapp2/src/com/caf/fmradio/FMRadioService.java +++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java @@ -1058,7 +1058,6 @@ 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)) { @@ -1071,12 +1070,10 @@ 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) { @@ -2065,8 +2062,6 @@ 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) @@ -2085,8 +2080,6 @@ 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) |