Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b1bcc97 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Fix NPE in InCallController due to potential null call." into oc-dev 

am: 2617c9ca

Change-Id: Ieae46dcb265b9032c01155c1796cfff63d0a3183
parents a7586c3d 2617c9ca

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

+2 −1
Original line number Diff line number Diff line
@@ -212,7 +212,8 @@ public final class InCallController extends CallsManagerListenerBase { 
                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;