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

Commit 7c17e346 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Add Null Pointer check for PhoneBook query results."

parents ffcab73f 42a9afa1

src/java/com/android/internal/telephony/uicc/AdnRecordCache.java

+3 −3
Original line number Diff line number Diff line
@@ -350,12 +350,12 @@ public final class AdnRecordCache extends Handler implements IccConstants { 
            //First Load from gloabl and then load from local PhoneBook.

            useLocalPb(false);

            result = mUsimPhoneBookManager.loadEfFilesFromUsim();

            combinedResult.addAll(result);

            if (null != result) combinedResult.addAll(result);

            useLocalPb(true);

            result = mUsimPhoneBookManager.loadEfFilesFromUsim();

            combinedResult.addAll(result);

            if (null != result) combinedResult.addAll(result);



            result = combinedResult;

            if (!combinedResult.isEmpty()) result = combinedResult;

        } else {

            result = getRecordsIfLoaded(efid);

        }