Merge "Fix CTS tests for devices without telephony feature" into main (d8e3d327) · Commits · e / os / android_packages_services_Telecomm

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -2588,9 +2588,11 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		}
		}

		// Bail early if the caller isn't the sim connection mgr.
		if (!isCallerConnectionManager) {
		Log.d(this, "queryRemoteConnectionServices: none; not sim call mgr.");
		Log.i(this, "queryRemoteConnectionServices, simServices = %s", simServices);
		// Bail early if the caller isn't the sim connection mgr or no sim connection service
		// other than caller available.
		if (!isCallerConnectionManager \|\| simServices.isEmpty()) {
		Log.d(this, "queryRemoteConnectionServices: not sim call mgr or no simservices.");
		noRemoteServices(callback);
		return;
		}
		@@ -2598,8 +2600,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		final List<ComponentName> simServiceComponentNames = new ArrayList<>();
		final List<IBinder> simServiceBinders = new ArrayList<>();

		Log.i(this, "queryRemoteConnectionServices, simServices = %s", simServices);

		for (ConnectionServiceWrapper simService : simServices) {
		final ConnectionServiceWrapper currentSimService = simService;