Merge "rm cacheCallAudioCallbacks flag" into main (342aeacc) · Commits · e / os / android_packages_services_Telecomm

flags/telecom_call_flags.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -16,13 +16,6 @@ flag {
		bug: "309541257"
		}

		flag {
		name: "cache_call_audio_callbacks"
		namespace: "telecom"
		description: "cache call audio callbacks if the service is not available and execute when set"
		bug: "321369729"
		}

		# OWNER=breadley TARGET=24Q4
		flag {
		name: "cache_call_events"

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

+5 −7

Original line number	Diff line number	Diff line
		@@ -2118,7 +2118,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		}

		private void processCachedCallbacks(CallSourceService service) {
		if(mFlags.cacheCallAudioCallbacks()) {
		synchronized (mCachedServiceCallbacks) {
		for (List<CachedCallback> callbacks : mCachedServiceCallbacks.values()) {
		callbacks.forEach(callback -> callback.executeCallback(service, this));
		@@ -2127,7 +2126,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		mCachedServiceCallbacks.clear();
		}
		}
		}

		public CallSourceService getService() {
		if (isTransactionalCall()) {

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

+3 −30

Original line number	Diff line number	Diff line
		@@ -201,16 +201,7 @@ public class CallEndpointController extends CallsManagerListenerBase {

		List<Call> calls = new ArrayList<>(mCallsManager.getTrackedCalls());
		for (Call call : calls) {
		if (mFeatureFlags.cacheCallAudioCallbacks()) {
		onCallEndpointChangedOrCache(call);
		} else {
		if (call != null && call.getConnectionService() != null) {
		call.getConnectionService().onCallEndpointChanged(call, mActiveCallEndpoint);
		} else if (call != null && call.getTransactionServiceWrapper() != null) {
		call.getTransactionServiceWrapper()
		.onCallEndpointChanged(call, mActiveCallEndpoint);
		}
		}
		}
		}

		@@ -231,17 +222,7 @@ public class CallEndpointController extends CallsManagerListenerBase {

		List<Call> calls = new ArrayList<>(mCallsManager.getTrackedCalls());
		for (Call call : calls) {
		if (mFeatureFlags.cacheCallAudioCallbacks()) {
		onAvailableEndpointsChangedOrCache(call);
		} else {
		if (call != null && call.getConnectionService() != null) {
		call.getConnectionService().onAvailableCallEndpointsChanged(call,
		mAvailableCallEndpoints);
		} else if (call != null && call.getTransactionServiceWrapper() != null) {
		call.getTransactionServiceWrapper().onAvailableCallEndpointsChanged(call,
		mAvailableCallEndpoints);
		}
		}
		}
		}

		@@ -262,15 +243,7 @@ public class CallEndpointController extends CallsManagerListenerBase {

		List<Call> calls = new ArrayList<>(mCallsManager.getTrackedCalls());
		for (Call call : calls) {
		if (mFeatureFlags.cacheCallAudioCallbacks()) {
		onMuteStateChangedOrCache(call, isMuted);
		} else {
		if (call != null && call.getConnectionService() != null) {
		call.getConnectionService().onMuteStateChanged(call, isMuted);
		} else if (call != null && call.getTransactionServiceWrapper() != null) {
		call.getTransactionServiceWrapper().onMuteStateChanged(call, isMuted);
		}
		}
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@ public class CallEndpointControllerTest extends TelecomTestCase {
		mFeatureFlags);
		doReturn(new HashSet<>(Arrays.asList(mCall))).when(mCallsManager).getTrackedCalls();
		doReturn(mConnectionService).when(mCall).getConnectionService();
		doReturn(mConnectionService).when(mCall).getService();
		doReturn(mCallAudioManager).when(mCallsManager).getCallAudioManager();
		when(mMockContext.getText(R.string.callendpoint_name_earpiece)).thenReturn("Earpiece");
		when(mMockContext.getText(R.string.callendpoint_name_bluetooth)).thenReturn("Bluetooth");

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -234,7 +234,6 @@ public class CallTest extends TelecomTestCase {

		@Test
		public void testMultipleCachedCallEvents() {
		when(mFeatureFlags.cacheCallAudioCallbacks()).thenReturn(true);
		when(mFeatureFlags.cacheCallEvents()).thenReturn(true);
		TransactionalServiceWrapper tsw = Mockito.mock(TransactionalServiceWrapper.class);
		Call call = createCall("1", Call.CALL_DIRECTION_INCOMING);
		@@ -272,7 +271,6 @@ public class CallTest extends TelecomTestCase {

		@Test
		public void testMultipleCachedMuteStateChanges() {
		when(mFeatureFlags.cacheCallAudioCallbacks()).thenReturn(true);
		TransactionalServiceWrapper tsw = Mockito.mock(TransactionalServiceWrapper.class);
		Call call = createCall("1", Call.CALL_DIRECTION_INCOMING);

		@@ -300,7 +298,6 @@ public class CallTest extends TelecomTestCase {

		@Test
		public void testCacheAfterServiceSet() {
		when(mFeatureFlags.cacheCallAudioCallbacks()).thenReturn(true);
		when(mFeatureFlags.cacheCallEvents()).thenReturn(true);
		TransactionalServiceWrapper tsw = Mockito.mock(TransactionalServiceWrapper.class);
		Call call = createCall("1", Call.CALL_DIRECTION_INCOMING);
		@@ -316,7 +313,6 @@ public class CallTest extends TelecomTestCase {

		@Test
		public void testMultipleCachedCurrentEndpointChanges() {
		when(mFeatureFlags.cacheCallAudioCallbacks()).thenReturn(true);
		TransactionalServiceWrapper tsw = Mockito.mock(TransactionalServiceWrapper.class);
		CallEndpoint earpiece = Mockito.mock(CallEndpoint.class);
		CallEndpoint speaker = Mockito.mock(CallEndpoint.class);
		@@ -350,7 +346,6 @@ public class CallTest extends TelecomTestCase {

		@Test
		public void testMultipleCachedAvailableEndpointChanges() {
		when(mFeatureFlags.cacheCallAudioCallbacks()).thenReturn(true);
		TransactionalServiceWrapper tsw = Mockito.mock(TransactionalServiceWrapper.class);
		CallEndpoint earpiece = Mockito.mock(CallEndpoint.class);
		CallEndpoint bluetooth = Mockito.mock(CallEndpoint.class);
		@@ -389,7 +384,6 @@ public class CallTest extends TelecomTestCase {
		*/
		@Test
		public void testAllCachedCallbacks() {
		when(mFeatureFlags.cacheCallAudioCallbacks()).thenReturn(true);
		when(mFeatureFlags.cacheCallEvents()).thenReturn(true);
		TransactionalServiceWrapper tsw = Mockito.mock(TransactionalServiceWrapper.class);
		CallEndpoint earpiece = Mockito.mock(CallEndpoint.class);