Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure CallId is not null when connection creation is complete." into oc-mr1-dev

Browse Source 
am: 9ad54229f5

Change-Id: I1de7a0a4cc9c630019e38b8154bfc1d470f56ae3
This commit is contained in:
Tyler Gunn
2017-08-14 19:05:31 +00:00
committed by android-build-merger
parent 38b54f61c0 9ad54229f5
commit aa43d2f26a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -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);