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

Commit 4698f5cc authored Mar 17, 2016 by Jack Yu

Fixed that bad address returned from network crashes the phone.

Added bad address handler to prevent the crash.

bug: 26920352
Change-Id: I58734b0fc08507ec18170a888b26347870214c66

parent 6dea04ab

src/java/com/android/internal/telephony/dataconnection/DataCallResponse.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -159,7 +159,13 @@ public class DataCallResponse {
		addrPrefixLen = (ia instanceof Inet4Address) ? 32 : 128;
		}
		if (DBG) Rlog.d(LOG_TAG, "addr/pl=" + addr + "/" + addrPrefixLen);
		try {
		la = new LinkAddress(ia, addrPrefixLen);
		} catch (IllegalArgumentException e) {
		throw new UnknownHostException("Bad parameter for LinkAddress, ia="
		+ ia.getHostAddress() + "/" + addrPrefixLen);
		}

		linkProperties.addLinkAddress(la);
		}
		}

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataCallResponseTest.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -83,4 +83,15 @@ public class DataCallResponseTest extends TelephonyTest {

		assertEquals(mDcResponse.mtu, linkProperties.getMtu());
		}

		@Test
		@SmallTest
		public void testSetLinkPropertiesInvalidAddress() throws Exception {

		mDcResponse.addresses = new String[]{"224.224.224.224"};

		LinkProperties linkProperties = new LinkProperties();
		assertEquals(SetupResult.ERR_UnacceptableParameter,
		mDcResponse.setLinkProperties(linkProperties, true));
		}
		}
		No newline at end of file