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

Commit 50c58604 authored by Ravindra's avatar Ravindra Committed by Steve Kondik
Browse files

Fix to prevent NPE 

While propagating merge failure to InCallUI check for call extras
to be empty.

Change-Id: I5192eb84fb67b369dd3b48f95ccb7571493574e5
CRs-Fixed: 964586
parent a5ee9a7d

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

+4 −2
Original line number Diff line number Diff line
@@ -361,8 +361,10 @@ final class ConnectionServiceWrapper extends ServiceBinder { 
                            // it here. That way we can also handle the UI of notifying that

                            // the merged has failed.

                            Bundle extras = call.getExtras();

                            if (extras != null) {

                                extras.putInt("MergeFail", new java.util.Random().nextInt());

                                call.setExtras(extras);

                            }

                            mCallsManager.onMergeFailed(call);

                        } else {

                            Log.w(this, "setConferenceMergeFailed, unknown call id: %s", callId);