commit 4ce2b184a7b4d64100e0471ecd8290cb5637d1bb
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 18 22:51:09 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 18 22:51:10 2017 +0000
tree a9c13d86ff8925b8a676c8302e8d35299e10b3b6
parent 545b2d61fce18d7d0643b597c76ce85198164247
parent 93dc55f22d5bab2b552f9e28c14fb0cd49814d52

Merge "Fix Telecom unit tests."

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

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index f74dc42..169ebd7 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -212,7 +212,8 @@
                 return CONNECTION_SUCCEEDED;
             }
 
-            if (call.isSelfManaged() && !mInCallServiceInfo.isSelfManagedCallsSupported()) {
+            if (call != null && call.isSelfManaged() &&
+                    !mInCallServiceInfo.isSelfManagedCallsSupported()) {
                 Log.i(this, "Skipping binding to %s - doesn't support self-mgd calls",
                         mInCallServiceInfo);
                 mIsConnected = false;