Merge "Fix the potential NullPointerException." am: 4b5c8e1076 (590bf9a4) · Commits · e / os / android_frameworks_base

services/net/java/android/net/ipmemorystore/NetworkAttributes.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ public class NetworkAttributes {

		@Nullable
		private static InetAddress getByAddressOrNull(@Nullable final byte[] address) {
		if (null == address) return null;
		try {
		return InetAddress.getByAddress(address);
		} catch (UnknownHostException e) {
		@@ -227,7 +228,9 @@ public class NetworkAttributes {
		}

		/**
		* Set the lease expiry timestamp of assigned v4 address.
		* Set the lease expiry timestamp of assigned v4 address. Long.MAX_VALUE is used
		* to represent "infinite lease".
		*
		* @param assignedV4AddressExpiry The lease expiry timestamp of assigned v4 address.
		* @return This builder.
		*/

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,8 @@ public interface OnNetworkAttributesRetrievedListener {
		// NonNull, but still don't crash the system server if null
		if (null != listener) {
		listener.onNetworkAttributesRetrieved(
		new Status(statusParcelable), l2Key,
		new NetworkAttributes(networkAttributesParcelable));
		new Status(statusParcelable), l2Key, null == networkAttributesParcelable
		? null : new NetworkAttributes(networkAttributesParcelable));
		}
		}