Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e77bbb58 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up clear communication device after audio ops flag" into main

parents 54b81d55 621bf9ae

flags/telecom_callaudioroutestatemachine_flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -81,14 +81,6 @@ flag { 
  bug: "301695370"

}



# OWNER=pmadapurmath TARGET=24Q3

flag {

  name: "clear_communication_device_after_audio_ops_complete"

  namespace: "telecom"

  description: "Clear the requested communication device after the audio operations are completed."

  bug: "315865533"

}



# OWNER=tgunn TARGET=24Q3

flag {

  name: "dont_use_communication_device_tracker"

src/com/android/server/telecom/CallAudioModeStateMachine.java

+8 −18
Original line number Diff line number Diff line
@@ -259,14 +259,6 @@ public class CallAudioModeStateMachine extends StateMachine { 
            Log.i(LOG_TAG, "Audio focus entering UNFOCUSED state");

            mLocalLog.log("Enter UNFOCUSED");

            if (mIsInitialized) {

                // Clear any communication device that was requested previously.

                // Todo: Remove once clearCommunicationDeviceAfterAudioOpsComplete is

                // completely rolled out.

                if (mFeatureFlags.callAudioCommunicationDeviceRefactor()

                        && !mFeatureFlags.clearCommunicationDeviceAfterAudioOpsComplete()) {

                    mCommunicationDeviceTracker.clearCommunicationDevice(mCommunicationDeviceTracker

                            .getCurrentLocallyRequestedCommunicationDevice());

                }

                if (mFeatureFlags.setAudioModeBeforeAbandonFocus()) {

                    Log.i(this, "enter: AudioManager#setMode(MODE_NORMAL)");

                    mAudioManager.setMode(AudioManager.MODE_NORMAL);
@@ -333,7 +325,6 @@ public class CallAudioModeStateMachine extends StateMachine { 
                            + "AudioManager#abandonAudioFocusRequest(); now unfocused");

                    mAudioManager.abandonAudioFocusForCall();

                    // Clear requested communication device after the call ends.

                    if (mFeatureFlags.clearCommunicationDeviceAfterAudioOpsComplete()) {

                    // Oh flags!  If we're using the refactored audio route switching, we should

                    // not be using the communication device tracker; that is exclusively for

                    // the old code path.
@@ -343,7 +334,6 @@ public class CallAudioModeStateMachine extends StateMachine { 
                                mCommunicationDeviceTracker

                                        .getCurrentLocallyRequestedCommunicationDevice());

                    }

                    }

                    return HANDLED;

                default:

                    // The forced focus switch commands are handled by BaseState.