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

Commit bf2d9c6c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11324029 from 3e344313 to 24Q2-release 

Change-Id: I2b8f2d9aab6c992feb95d46b5c51e6780bc437f5
parents c44d62fb 3e344313

flags/telecom_callaudioroutestatemachine_flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -62,3 +62,10 @@ flag { 
  description: "Update supported route mask when Bluetooth devices audio connected."

  bug: "301695370"

}



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"

}

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

+10 −1
Original line number Diff line number Diff line
@@ -280,7 +280,10 @@ public class CallAudioModeStateMachine extends StateMachine { 
            mLocalLog.log("Enter UNFOCUSED");

            if (mIsInitialized) {

                // Clear any communication device that was requested previously.

                if (mFeatureFlags.callAudioCommunicationDeviceRefactor()) {

                // Todo: Remove once clearCommunicationDeviceAfterAudioOpsComplete is

                // completely rolled out.

                if (mFeatureFlags.callAudioCommunicationDeviceRefactor()

                        && !mFeatureFlags.clearCommunicationDeviceAfterAudioOpsComplete()) {

                    mCommunicationDeviceTracker.clearCommunicationDevice(mCommunicationDeviceTracker

                            .getCurrentLocallyRequestedCommunicationDevice());

                }
@@ -353,6 +356,12 @@ public class CallAudioModeStateMachine extends StateMachine { 
                    } else {

                        mAudioManager.abandonAudioFocusForCall();

                    }

                    // Clear requested communication device after the call ends.

                    if (mFeatureFlags.clearCommunicationDeviceAfterAudioOpsComplete()) {

                        mCommunicationDeviceTracker.clearCommunicationDevice(

                                mCommunicationDeviceTracker

                                        .getCurrentLocallyRequestedCommunicationDevice());

                    }

                    return HANDLED;

                default:

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

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

+3 −3
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import android.os.PersistableBundle; 
import android.os.Process;

import android.os.ResultReceiver;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.SystemVibrator;

import android.os.Trace;

import android.os.UserHandle;
@@ -3131,9 +3132,8 @@ public class CallsManager extends Call.ListenerBase 
     * @return {@code true} if the speakerphone should automatically be enabled.

     */

    private static boolean isSpeakerEnabledForVideoCalls() {

        return TelephonyProperties.videocall_audio_output()

                .orElse(TelecomManager.AUDIO_OUTPUT_DEFAULT)

                == TelecomManager.AUDIO_OUTPUT_ENABLE_SPEAKER;

        return SystemProperties.getInt(TelecomManager.PROPERTY_VIDEOCALL_AUDIO_OUTPUT,

                TelecomManager.AUDIO_OUTPUT_DEFAULT) == TelecomManager.AUDIO_OUTPUT_ENABLE_SPEAKER;

    }



    /**