Merge "Remove flag enable_call_audio_watchdog." into main (0155ca00) · Commits · e / os / android_packages_services_Telecomm

flags/telecom_calls_manager_flags.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -16,14 +16,3 @@ flag {
		description: "Enables simultaneous call sequencing for SIM PhoneAccounts"
		bug: "327038818"
		}

		# OWNER=tgunn TARGET=25Q2
		flag {
		name: "enable_call_audio_watchdog"
		namespace: "telecom"
		description: "Enables tracking of audio resources for voip calls to aid in diagnostics."
		bug: "384570270"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

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

+34 −31

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ public class CallsManager extends Call.ListenerBase
		private final com.android.internal.telephony.flags.FeatureFlags mTelephonyFeatureFlags;

		private final IncomingCallFilterGraphProvider mIncomingCallFilterGraphProvider;
		private final CallAudioWatchdog mCallAudioWatchDog;
		private CallAudioWatchdog mCallAudioWatchDog;
		private final CallAudioRouteAdapter mCallAudioRouteAdapter;

		private final ConnectionServiceFocusManager.CallsManagerRequester mRequester =
		@@ -685,7 +685,7 @@ public class CallsManager extends Call.ListenerBase
		mCallerInfoLookupHelper = callerInfoLookupHelper;
		mEmergencyCallDiagnosticLogger = emergencyCallDiagnosticLogger;
		mIncomingCallFilterGraphProvider = incomingCallFilterGraphProvider;
		if (featureFlags.enableCallAudioWatchdog()) {

		mHandlerThread.start();
		mAudioCallbackHandler = new Handler(mHandlerThread.getLooper());
		mCallAudioWatchDog = new CallAudioWatchdog(
		@@ -710,10 +710,6 @@ public class CallsManager extends Call.ListenerBase
		}
		}, clockProxy, mAudioCallbackHandler,
		featureFlags.telecomMetricsSupport() ? metricsController : null);
		} else {
		mAudioCallbackHandler = null;
		mCallAudioWatchDog = null;
		}

		mDtmfLocalTonePlayer =
		new DtmfLocalTonePlayer(new DtmfLocalTonePlayer.ToneGeneratorProxy(), featureFlags);
		@@ -855,9 +851,7 @@ public class CallsManager extends Call.ListenerBase
		// this needs to be after the mCallAudioManager
		mListeners.add(mPhoneStateBroadcaster);
		mListeners.add(mCallStreamingNotification);
		if (featureFlags.enableCallAudioWatchdog()) {
		mListeners.add(mCallAudioWatchDog);
		}

		if (mFeatureFlags.voipCallMonitorRefactor()) {
		mVoipCallMonitor.registerNotificationListener();
		@@ -7196,6 +7190,15 @@ public class CallsManager extends Call.ListenerBase
		mCallSequencingAdapter = adapter;
		}

		@VisibleForTesting
		public void setCallAudioWatchDog(CallAudioWatchdog callAudioWatchdog) {
		mListeners.remove(mCallAudioWatchDog);
		mCallAudioWatchDog = callAudioWatchdog;
		if (callAudioWatchdog != null) {
		mListeners.add(callAudioWatchdog);
		}
		}

		public void waitForAudioToUpdate(boolean expectActive) {
		Log.i(this, "waitForAudioToUpdate");
		if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {

tests/src/com/android/server/telecom/tests/CallsManagerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@ public class CallsManagerTest extends TelecomTestCase {
		mFeatureFlags, lock) -> mIncomingCallFilterGraph,
		mMockTelecomMetricsController,
		mMockVibratorAdapter);

		mCallsManager.setCallAudioWatchDog(null);
		when(mPhoneAccountRegistrar.getPhoneAccount(
		eq(SELF_MANAGED_HANDLE), any())).thenReturn(SELF_MANAGED_ACCOUNT);
		when(mPhoneAccountRegistrar.getPhoneAccount(