Merge "Clean up early update call audio state flag" into main (d28507db) · Commits · e / os / android_packages_services_Telecomm

flags/telecom_callaudioroutestatemachine_flags.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -76,17 +76,6 @@ flag {
		}
		}

		# OWNER=pmadapurmath TARGET=24Q3
		flag {
		name: "early_update_internal_call_audio_state"
		namespace: "telecom"
		description: "Update internal call audio state before sending updated state to ICS"
		bug: "335538831"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		# OWNER=tgunn TARGET=25Q2
		flag {
		name: "only_clear_communication_device_on_inactive"

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

+10 −35

Original line number	Diff line number	Diff line
		@@ -286,13 +286,8 @@ public class CallAudioRouteStateMachine extends StateMachine implements CallAudi
		CallAudioState newState = new CallAudioState(mIsMuted, ROUTE_EARPIECE,
		mAvailableRoutes, null,
		mBluetoothRouteManager.getConnectedDevices());
		if (mFeatureFlags.earlyUpdateInternalCallAudioState()) {
		updateInternalCallAudioState();
		setSystemAudioState(newState, true);
		} else {
		setSystemAudioState(newState, true);
		updateInternalCallAudioState();
		}
		}

		@Override
		@@ -506,13 +501,8 @@ public class CallAudioRouteStateMachine extends StateMachine implements CallAudi
		AudioDeviceInfo.TYPE_WIRED_HEADSET, null);
		CallAudioState newState = new CallAudioState(mIsMuted, ROUTE_WIRED_HEADSET,
		mAvailableRoutes, null, mBluetoothRouteManager.getConnectedDevices());
		if (mFeatureFlags.earlyUpdateInternalCallAudioState()) {
		updateInternalCallAudioState();
		setSystemAudioState(newState, true);
		} else {
		setSystemAudioState(newState, true);
		updateInternalCallAudioState();
		}
		}

		@Override
		@@ -741,13 +731,8 @@ public class CallAudioRouteStateMachine extends StateMachine implements CallAudi
		CallAudioState newState = new CallAudioState(mIsMuted, ROUTE_BLUETOOTH,
		mAvailableRoutes, mBluetoothRouteManager.getBluetoothAudioConnectedDevice(),
		mBluetoothRouteManager.getConnectedDevices());
		if (mFeatureFlags.earlyUpdateInternalCallAudioState()) {
		updateInternalCallAudioState();
		setSystemAudioState(newState, true);
		} else {
		setSystemAudioState(newState, true);
		updateInternalCallAudioState();
		}
		// Do not send RINGER_MODE_CHANGE if no Bluetooth SCO audio device is available
		if (mBluetoothRouteManager.getBluetoothAudioConnectedDevice() != null) {
		mCallAudioManager.onRingerModeChange();
		@@ -895,13 +880,8 @@ public class CallAudioRouteStateMachine extends StateMachine implements CallAudi
		CallAudioState newState = new CallAudioState(mIsMuted, ROUTE_BLUETOOTH,
		mAvailableRoutes, mBluetoothRouteManager.getBluetoothAudioConnectedDevice(),
		mBluetoothRouteManager.getConnectedDevices());
		if (mFeatureFlags.earlyUpdateInternalCallAudioState()) {
		updateInternalCallAudioState();
		setSystemAudioState(newState, true);
		} else {
		setSystemAudioState(newState, true);
		updateInternalCallAudioState();
		}
		}

		@Override
		@@ -1120,13 +1100,8 @@ public class CallAudioRouteStateMachine extends StateMachine implements CallAudi
		mWasOnSpeaker = true;
		CallAudioState newState = new CallAudioState(mIsMuted, ROUTE_SPEAKER,
		mAvailableRoutes, null, mBluetoothRouteManager.getConnectedDevices());
		if (mFeatureFlags.earlyUpdateInternalCallAudioState()) {
		updateInternalCallAudioState();
		setSystemAudioState(newState, true);
		} else {
		setSystemAudioState(newState, true);
		updateInternalCallAudioState();
		}
		}

		@Override