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

Commit a96f8a59 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Add null check for the parameter CallerInfo in onCallerInfoQueryComplete"

parents 793ddf0e f21cc293

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

+2 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,8 @@ public class CallsManager extends Call.ListenerBase 
                new CallerInfoLookupHelper.OnQueryCompleteListener() {

                    @Override

                    public void onCallerInfoQueryComplete(Uri handle, CallerInfo info) {

                        if (info.preferredPhoneAccountComponent != null &&

                        if (info != null &&

                                info.preferredPhoneAccountComponent != null &&

                                info.preferredPhoneAccountId != null &&

                                !info.preferredPhoneAccountId.isEmpty()) {

                            PhoneAccountHandle contactDefaultHandle = new PhoneAccountHandle(