Merge "Fix PhonebookRecordInfo AIDL conversion to not allow null" (aacfeef4) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -4439,7 +4439,7 @@ public class RILUtils {
		if (record != null) {
		return record.toPhonebookRecordInfoAidl();
		}
		return null;
		return new android.hardware.radio.sim.PhonebookRecordInfo();
		}

		/**

+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;
		}