| commit | be3cc2a0de47af275cf4bc83699013c82162059a | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Nov 26 07:23:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 26 07:23:37 2021 +0000 |
| tree | 7967e5b64f81f574363cc2e582beb8ce655b7d6d | |
| parent | 4f6833fee45852cada1365dd4c638b874cdc32a5 [diff] | |
| parent | 53cf445e6a16716d87063df77670d99f65ddb00f [diff] |
Merge "net: fix NPE when reading IP configurations" am: 53cf445e6a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1879657 Change-Id: I9ad5d7bdb2c9aa08bcfeca78c0a4858101f28444
diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java index df1eb6d..d17dbde 100644 --- a/services/core/java/com/android/server/net/IpConfigStore.java +++ b/services/core/java/com/android/server/net/IpConfigStore.java
@@ -322,8 +322,11 @@ 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 {