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

Commit eec8e24e authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "net: fix NPE when reading IP configurations" am: eed1a20c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1879657

Change-Id: I9ad5d7bdb2c9aa08bcfeca78c0a4858101f28444
parents 3ac404a5 eed1a20c

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 {