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

Commit 11864d02 authored by Grant Menke's avatar Grant Menke
Browse files

Added null check when setting up conferenceCall. 

Without this null check, it was possible for the conferenceCallId to be non-null but the conferenceCall to be null. This resulted in errantly calling setParentAndChildCall with a null value. Wrapping in a null check prevents this behavior.

Bug: 230787193
Test: Manual Test
Change-Id: I330fcd3f99f81a038731d177ace8b9fe14680cf9
parent 03dd7bb0

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

100755 → 100644
+7 −1
Original line number Diff line number Diff line
@@ -436,8 +436,14 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                            childCall.setParentAndChildCall(null);

                        } else {

                            Call conferenceCall = mCallIdMapper.getCall(conferenceCallId);

                            // In a situation where a cmgr is used, the conference should be tracked

                            // by that cmgr's instance of CSW. The cmgr instance of CSW will track

                            // and properly set the parent and child calls so the request from the

                            // original Telephony instance of CSW can be ignored.

                            if (conferenceCall != null){

                                childCall.setParentAndChildCall(conferenceCall);

                            }

                        }

                    } else {

                        // Log.w(this, "setIsConferenced, unknown call id: %s", args.arg1);

                    }