Fix issue that the disconnect tone doesn't sound from BTHS
When the call is disconnected, the BTHF state is changed to IDLE and
SCO connection is disconnected before playing disconnect tone. So the
disconnect tone can't be sound from BTHS.
Add DISCONNECTED state for HFP and keep the state until disconnect tone
sounds from BT.
Test: manual - Checked whether the disconnect tone is sound from the
BTHS
Test: auto - Passed BluetoothPhoneServiceTest
Bug: 69645337
Change-Id: I6deca4ccee97b8b1a50c491810d2b75f6741c0e9
diff --git a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
index 93d4f71..d0fcfa1 100644
--- a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
+++ b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
@@ -66,6 +66,7 @@
private static final int CALL_STATE_INCOMING = 4;
private static final int CALL_STATE_WAITING = 5;
private static final int CALL_STATE_IDLE = 6;
+ private static final int CALL_STATE_DISCONNECTED = 7;
// match up with bthf_call_state_t of bt_hf.h
// Terminate all held or set UDUB("busy") to a waiting call
@@ -84,6 +85,7 @@
private String mRingingAddress = null;
private int mRingingAddressType = 0;
private Call mOldHeldCall = null;
+ private boolean mIsDisconnectedTonePlaying = false;
/**
* Binder implementation of IBluetoothHeadsetPhone. Implements the command interface that the
@@ -387,6 +389,12 @@
}
updateHeadsetWithCallState(false /* force */);
}
+
+ @Override
+ public void onDisconnectedTonePlaying(boolean isTonePlaying) {
+ mIsDisconnectedTonePlaying = isTonePlaying;
+ updateHeadsetWithCallState(false /* force */);
+ }
};
/**
@@ -816,6 +824,7 @@
CallsManager callsManager = mCallsManager;
Call ringingCall = mCallsManager.getRingingCall();
Call dialingCall = mCallsManager.getOutgoingCall();
+ boolean hasOnlyDisconnectedCalls = mCallsManager.hasOnlyDisconnectedCalls();
//
// !! WARNING !!
@@ -831,6 +840,9 @@
bluetoothCallState = CALL_STATE_INCOMING;
} else if (dialingCall != null) {
bluetoothCallState = CALL_STATE_ALERTING;
+ } else if (hasOnlyDisconnectedCalls || mIsDisconnectedTonePlaying) {
+ // Keep the DISCONNECTED state until the disconnect tone's playback is done
+ bluetoothCallState = CALL_STATE_DISCONNECTED;
}
return bluetoothCallState;
}