Merge "net: fix NPE when reading IP configurations" (eed1a20c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/net/IpConfigStore.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -322,8 +322,11 @@ public class IpConfigStore {
		gateway = InetAddresses.parseNumericAddress(in.readUTF());
		}
		// If the destination is a default IPv4 route, use the gateway
		// address unless already set.
		if (dest.getAddress() instanceof Inet4Address
		// address unless already set. If there is no destination, assume
		// it is default route and use the gateway address in all cases.
		if (dest == null) {
		gatewayAddress = gateway;
		} else if (dest.getAddress() instanceof Inet4Address
		&& dest.getPrefixLength() == 0 && gatewayAddress == null) {
		gatewayAddress = gateway;
		} else {