Merge "Ensure CallId is not null when connection creation is complete." into oc-mr1-dev (aa43d2f2) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/ConnectionService.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -1440,6 +1440,12 @@ public abstract class ConnectionService extends Service {
		*/
		private void notifyCreateConnectionComplete(final String callId) {
		Log.i(this, "notifyCreateConnectionComplete %s", callId);
		if (callId == null) {
		// This could happen if the connection fails quickly and is removed from the
		// ConnectionService before Telecom sends the create connection complete callback.
		Log.w(this, "notifyCreateConnectionComplete: callId is null.");
		return;
		}
		onCreateConnectionComplete(findConnectionForAction(callId,
		"notifyCreateConnectionComplete"));
		}
		@@ -2166,7 +2172,7 @@ public abstract class ConnectionService extends Service {
		}

		private Connection findConnectionForAction(String callId, String action) {
		if (mConnectionById.containsKey(callId)) {
		if (callId != null && mConnectionById.containsKey(callId)) {
		return mConnectionById.get(callId);
		}
		Log.w(this, "%s - Cannot find Connection %s", action, callId);