Merge "use createStringArray API" into rvc-dev (3ebf5656) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −8

Original line number	Diff line number	Diff line
		@@ -92,14 +92,9 @@ public class AdnRecord implements Parcelable {
		recordNumber = source.readInt();
		alphaTag = source.readString();
		number = source.readString();
		final int len = source.readInt();
		if (len > 0) {
		emails = new String[len];
		source.readStringArray(emails);
		emails = source.createStringArray();

		return new AdnRecord(efid, recordNumber, alphaTag, number, emails);
		} else {
		return new AdnRecord(efid, recordNumber, alphaTag, number, null);
		}
		}

		@Override

+15 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.internal.telephony;

		import android.os.Parcel;
		import java.util.Arrays;
		import junit.framework.TestCase;
		import android.test.suitebuilder.annotation.SmallTest;

		@@ -174,6 +176,19 @@ public class AdnRecordTest extends TestCase {
		assertEquals("+18885551212,12345678", adn.getNumber());
		assertFalse(adn.isEmpty());
		}

		@SmallTest
		public void testParcelUnParcel() throws Exception {
		AdnRecord adn = new AdnRecord(0,0,"Voice Mail",
		"+18056377243", new String[]{"adc@email.com"});
		Parcel p = Parcel.obtain();
		adn.writeToParcel(p, 0);
		p.setDataPosition(0);
		AdnRecord copy = AdnRecord.CREATOR.createFromParcel(p);
		assertEquals(adn.getAlphaTag(), copy.getAlphaTag());
		assertEquals(adn.getNumber(), copy.getNumber());
		assertTrue(Arrays.equals(adn.getEmails(), copy.getEmails()));
		}
		}