summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
diff options
context:
space:
mode:
authorIhab Awad <ihab@google.com>2014-08-15 22:58:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-15 19:10:34 +0000
commit78fc9220d4f99332370c1294dd865703db2f2ae0 (patch)
tree502f4f5bd581465d1db21995c719525701108756 /telecomm/java/android
parentbd431ee5d302f46ac3cc846797fa7a5551f7b42e (diff)
parent621cd325d57a93a6d0f7afef69e24f6b18bcfb72 (diff)
downloadframeworks_base-78fc9220d4f99332370c1294dd865703db2f2ae0.zip
frameworks_base-78fc9220d4f99332370c1294dd865703db2f2ae0.tar.gz
frameworks_base-78fc9220d4f99332370c1294dd865703db2f2ae0.tar.bz2
Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev
Diffstat (limited to 'telecomm/java/android')
-rw-r--r--telecomm/java/android/telecomm/ConnectionService.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/telecomm/java/android/telecomm/ConnectionService.java b/telecomm/java/android/telecomm/ConnectionService.java
index 44aacfc..c2b401d 100644
--- a/telecomm/java/android/telecomm/ConnectionService.java
+++ b/telecomm/java/android/telecomm/ConnectionService.java
@@ -481,15 +481,12 @@ public abstract class ConnectionService extends Service {
case Connection.STATE_INITIALIZING:
Log.d(this, "State changed to STATE_INITIALIZING; ignoring");
return; // Don't want to stop listening on this state transition.
- default:
- Log.d(this, "Connection created in state %s",
- Connection.stateToString(state));
- connectionCreated(callId, request, createdConnection);
- break;
}
c.removeConnectionListener(this);
}
});
+ Log.d(this, "Connection created in state INITIALIZING");
+ connectionCreated(callId, request, createdConnection);
} else if (createdConnection.getState() == Connection.STATE_CANCELED) {
// Tell telecomm not to attempt any more services.
mAdapter.handleCreateConnectionCancelled(callId, request);