diff options
| author | Grace Jia <xiaotonj@google.com> | 2023-11-22 23:42:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-22 23:42:09 +0000 |
| commit | 5e141f9d4516c1eddb7827e6a9b93107d659a9f7 (patch) | |
| tree | 7e169e34e10f27519abec289a3bc221339a1ad91 /src | |
| parent | 26b9fdc565fc80cadb2bd1e2e927f81d656a7ce5 (diff) | |
| parent | b4ebf4eadfee05ff41347e4dcbeb51ee9283b0e1 (diff) | |
| download | Telecomm-5e141f9d4516c1eddb7827e6a9b93107d659a9f7.tar.gz | |
Merge "Reset mute state when entering QuiescentBluetoothState." into main
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/server/telecom/CallAudioRouteStateMachine.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java index c803de5a9..bfb76d8b5 100644 --- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java +++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java @@ -17,7 +17,6 @@ package com.android.server.telecom; -import android.annotation.FlaggedApi; import android.app.ActivityManager; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; @@ -1074,6 +1073,9 @@ public class CallAudioRouteStateMachine extends StateMachine implements CallAudi public void enter() { super.enter(); mHasUserExplicitlyLeftBluetooth = false; + if (mFeatureFlags.resetMuteWhenEnteringQuiescentBtRoute()) { + setMuteOn(false); + } updateInternalCallAudioState(); } |