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

Commit 47f972c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent Telecom from holding focus indefinitely" am: cf8ff32b am:... 

Merge "Prevent Telecom from holding focus indefinitely" am: cf8ff32b am: 88d700c6 am: 6ada697a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1682350

Change-Id: Ie013750c61167411a06331431158b7da3903df41
parents 7aab997e 6ada697a

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

+8 −0
Original line number Diff line number Diff line
@@ -493,6 +493,8 @@ public class CallAudioRouteStateMachine extends StateMachine { 
                case SWITCH_FOCUS:

                    if (msg.arg1 == ACTIVE_FOCUS || msg.arg1 == RINGING_FOCUS) {

                        transitionTo(mActiveEarpieceRoute);

                    } else {

                        mCallAudioManager.notifyAudioOperationsComplete();

                    }

                    return HANDLED;

                default:
@@ -695,6 +697,8 @@ public class CallAudioRouteStateMachine extends StateMachine { 
                case SWITCH_FOCUS:

                    if (msg.arg1 == ACTIVE_FOCUS || msg.arg1 == RINGING_FOCUS) {

                        transitionTo(mActiveHeadsetRoute);

                    } else {

                        mCallAudioManager.notifyAudioOperationsComplete();

                    }

                    return HANDLED;

                default:
@@ -1051,6 +1055,8 @@ public class CallAudioRouteStateMachine extends StateMachine { 
                        } else {

                            transitionTo(mRingingBluetoothRoute);

                        }

                    } else {

                        mCallAudioManager.notifyAudioOperationsComplete();

                    }

                    return HANDLED;

                case BT_AUDIO_DISCONNECTED:
@@ -1274,6 +1280,8 @@ public class CallAudioRouteStateMachine extends StateMachine { 
                    if (msg.arg1 == ACTIVE_FOCUS || msg.arg1 == RINGING_FOCUS) {

                        setSpeakerphoneOn(true);

                        transitionTo(mActiveSpeakerRoute);

                    } else {

                        mCallAudioManager.notifyAudioOperationsComplete();

                    }

                    return HANDLED;

                default: