commit 7281e466ebea45912add4b9a4598ee00945c8721
author Santos Cordon <santoscordon@google.com> Tue Aug 05 20:43:49 2014 -0700
committer The Android Automerger <android-build@google.com> Thu Aug 07 15:26:45 2014 -0700
tree 49aad2b149b888c133c7437e4a4157f2f9371061
parent 3d4a4be6a98255bf9f84aa95bc86dd3686486c72

Remove audio handling from telephony. (2/2)

Bug: 16175960
Change-Id: Id4ec9963f559b4cd1870c18b91521afca8d8f153

src/java/com/android/internal/telephony/CallManager.java

diff --git a/src/java/com/android/internal/telephony/CallManager.java b/src/java/com/android/internal/telephony/CallManager.java
index 96407c7..3f6df87 100644
--- a/src/java/com/android/internal/telephony/CallManager.java
+++ b/src/java/com/android/internal/telephony/CallManager.java
@@ -502,72 +502,6 @@
         return getFirstActiveRingingCall(subId).getPhone();
     }
 
-    public void setAudioMode() {
-        Context context = getContext();
-        if (context == null) return;
-        AudioManager audioManager = (AudioManager)
-                context.getSystemService(Context.AUDIO_SERVICE);
-
-        // change the audio mode and request/abandon audio focus according to phone state,
-        // but only on audio mode transitions
-        switch (getState()) {
-            case RINGING:
-                int curAudioMode = audioManager.getMode();
-                if (curAudioMode != AudioManager.MODE_RINGTONE) {
-                    // only request audio focus if the ringtone is going to be heard
-                    if (audioManager.getStreamVolume(AudioManager.STREAM_RING) > 0) {
-                        if (VDBG) Rlog.d(LOG_TAG, "requestAudioFocus on STREAM_RING");
-                        audioManager.requestAudioFocusForCall(AudioManager.STREAM_RING,
-                                AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
-                    }
-                    if(!mSpeedUpAudioForMtCall) {
-                        audioManager.setMode(AudioManager.MODE_RINGTONE);
-                    }
-                }
-
-                if (mSpeedUpAudioForMtCall && (curAudioMode != AudioManager.MODE_IN_CALL)) {
-                    audioManager.setMode(AudioManager.MODE_IN_CALL);
-                }
-                break;
-            case OFFHOOK:
-                Phone offhookPhone = getFgPhone();
-                if (getActiveFgCallState() == Call.State.IDLE) {
-                    // There is no active Fg calls, the OFFHOOK state
-                    // is set by the Bg call. So set the phone to bgPhone.
-                    offhookPhone = getBgPhone();
-                }
-
-                int newAudioMode = AudioManager.MODE_IN_CALL;
-                if (offhookPhone instanceof SipPhone) {
-                    Rlog.d(LOG_TAG, "setAudioMode Set audio mode for SIP call!");
-                    // enable IN_COMMUNICATION audio mode instead for sipPhone
-                    newAudioMode = AudioManager.MODE_IN_COMMUNICATION;
-                }
-                int currMode = audioManager.getMode();
-                if (currMode != newAudioMode || mSpeedUpAudioForMtCall) {
-                    // request audio focus before setting the new mode
-                    if (VDBG) Rlog.d(LOG_TAG, "requestAudioFocus on STREAM_VOICE_CALL");
-                    audioManager.requestAudioFocusForCall(AudioManager.STREAM_VOICE_CALL,
-                            AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
-                    Rlog.d(LOG_TAG, "setAudioMode Setting audio mode from "
-                            + currMode + " to " + newAudioMode);
-                    audioManager.setMode(newAudioMode);
-                }
-                mSpeedUpAudioForMtCall = false;
-                break;
-            case IDLE:
-                if (audioManager.getMode() != AudioManager.MODE_NORMAL) {
-                    audioManager.setMode(AudioManager.MODE_NORMAL);
-                    if (VDBG) Rlog.d(LOG_TAG, "abandonAudioFocus");
-                    // abandon audio focus after the mode has been set back to normal
-                    audioManager.abandonAudioFocusForCall();
-                }
-                mSpeedUpAudioForMtCall = false;
-                break;
-        }
-        Rlog.d(LOG_TAG, "setAudioMode state = " + getState());
-    }
-
     private Context getContext() {
         Phone defaultPhone = getDefaultPhone();
         return ((defaultPhone == null) ? null : defaultPhone.getContext());
@@ -690,24 +624,6 @@
             }
         }
 
-        Context context = getContext();
-        if (context == null) {
-            Rlog.d(LOG_TAG, "Speedup Audio Path enhancement: Context is null");
-        } else if (context.getResources().getBoolean(
-                com.android.internal.R.bool.config_speed_up_audio_on_mt_calls)) {
-            Rlog.d(LOG_TAG, "Speedup Audio Path enhancement");
-            AudioManager audioManager = (AudioManager)
-                    context.getSystemService(Context.AUDIO_SERVICE);
-            int currMode = audioManager.getMode();
-            if ((currMode != AudioManager.MODE_IN_CALL)
-                    && !(ringingPhone instanceof SipPhone)) {
-                Rlog.d(LOG_TAG, "setAudioMode Setting audio mode from " +
-                                currMode + " to " + AudioManager.MODE_IN_CALL);
-                audioManager.setMode(AudioManager.MODE_IN_CALL);
-                mSpeedUpAudioForMtCall = true;
-            }
-        }
-
         // We only support the AUDIO_ONLY video state in this scenario.
         ringingPhone.acceptCall(VideoCallProfile.VideoState.AUDIO_ONLY);