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

Commit 9f42309c authored by xiaotonj's avatar xiaotonj
Browse files

Fix NPE in Call. 

Bug: b/308935922
Test: make
Change-Id: I7347d684eb6adc46d833b7992444fb93c3828e59
parent da111027

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

+8 −2
Original line number Diff line number Diff line
@@ -306,14 +306,20 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
                @Override

                public void onCallerInfoQueryComplete(Uri handle, CallerInfo callerInfo) {

                    synchronized (mLock) {

                        Call.this.setCallerInfo(handle, callerInfo);

                        Call call = Call.this;

                        if (call != null) {

                            call.setCallerInfo(handle, callerInfo);

                        }

                    }

                }



                @Override

                public void onContactPhotoQueryComplete(Uri handle, CallerInfo callerInfo) {

                    synchronized (mLock) {

                        Call.this.setCallerInfo(handle, callerInfo);

                        Call call = Call.this;

                        if (call != null) {

                            call.setCallerInfo(handle, callerInfo);

                        }

                    }

                }

            };