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

Commit 05f646ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix PhonebookRecordInfo AIDL conversion to not allow null" am:... 

Merge "Fix PhonebookRecordInfo AIDL conversion to not allow null" am: aacfeef4 am: 514222f5 am: 96ae9634 am: 6464b9ce am: 1259197f

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2060229



Change-Id: I2d189c62e07b81851532633df389e18370636082
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0036c294 1259197f

src/java/com/android/internal/telephony/RILUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -4442,7 +4442,7 @@ public class RILUtils { 
        if (record != null) {

            return record.toPhonebookRecordInfoAidl();

        }

        return null;

        return new android.hardware.radio.sim.PhonebookRecordInfo();

    }



    /**

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

+5 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import android.text.TextUtils; 


import com.android.internal.telephony.util.ArrayUtils;



import java.util.Arrays;

import java.util.ArrayList;

import java.util.Arrays;



/**

 * Represents a Phonebook entry from the SIM.
@@ -92,6 +92,8 @@ public class SimPhonebookRecord { 
        pbRecordInfo.number = convertNullToEmptyString(convertNumberToRecordFormat(mNumber));

        if (mEmails != null) {

            pbRecordInfo.emails = mEmails;

        } else {

            pbRecordInfo.emails = new String[0];

        }

        if (mAdditionalNumbers != null) {

            String[] additionalNumbers = new String[mAdditionalNumbers.length];
@@ -99,6 +101,8 @@ public class SimPhonebookRecord { 
                additionalNumbers[i] = convertNumberToRecordFormat(mAdditionalNumbers[i]);

            }

            pbRecordInfo.additionalNumbers = additionalNumbers;

        } else {

            pbRecordInfo.additionalNumbers = new String[0];

        }

        return pbRecordInfo;

    }