pa-fazil
/
android_packages_services_Telecomm
mirror of https://github.com/fazilsheik96/android_packages_services_Telecomm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Hall Liu 2019-11-15 00:27:11 +00:00 committed by Gerrit Code Review
parent 793ddf0e63 f21cc2930a
commit a96f8a59d2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/server/telecom/CallsManager.java
View File

@ -1766,7 +1766,8 @@ public class CallsManager extends Call.ListenerBase
new CallerInfoLookupHelper.OnQueryCompleteListener() { new CallerInfoLookupHelper.OnQueryCompleteListener() {
@Override @Override
public void onCallerInfoQueryComplete(Uri handle, CallerInfo info) { public void onCallerInfoQueryComplete(Uri handle, CallerInfo info) {
if (info.preferredPhoneAccountComponent != null && if (info != null &&
info.preferredPhoneAccountComponent != null &&
info.preferredPhoneAccountId != null && info.preferredPhoneAccountId != null &&
!info.preferredPhoneAccountId.isEmpty()) { !info.preferredPhoneAccountId.isEmpty()) {
PhoneAccountHandle contactDefaultHandle = new PhoneAccountHandle( PhoneAccountHandle contactDefaultHandle = new PhoneAccountHandle(