diff options
| author | Roshan Pius <rpius@google.com> | 2019-11-26 13:53:36 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-11-26 14:12:03 -0800 |
| commit | 8bcd6509133a733c410a8112736c5d5245274295 (patch) | |
| tree | 0e473d9d69c6ace7033d0f7bc9960aba71adf5b9 /service | |
| parent | c0231860696a65066854e6f1820d6684f4fd42ca (diff) | |
wifi: Use public APIs for RouteInfo.isIPv4Default
Bug: 145232020
Test: Connect to wifi networks
Test: Ensured that RouteInfo no longer shows up in the wifi-service
extenal hidden API dependency list.
Test: atest com.android.server.wifi
Change-Id: I1539adde5862c6cbdc3bfcbc25c00f072d6cf74f
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiBackupDataV1Parser.java | 3 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/util/XmlUtil.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiBackupDataV1Parser.java b/service/java/com/android/server/wifi/WifiBackupDataV1Parser.java index c209253d7..13352f7e1 100644 --- a/service/java/com/android/server/wifi/WifiBackupDataV1Parser.java +++ b/service/java/com/android/server/wifi/WifiBackupDataV1Parser.java @@ -516,7 +516,8 @@ class WifiBackupDataV1Parser implements WifiBackupDataParser { if (gatewayAddressString != null) { InetAddress gateway = NetworkUtils.numericToInetAddress(gatewayAddressString); RouteInfo route = new RouteInfo(null, gateway, null, RouteInfo.RTN_UNICAST); - if (route.isIPv4Default()) { + if (route.isDefaultRoute() + && route.getDestination().getAddress() instanceof Inet4Address) { builder.setGateway(gateway); } else { Log.w(TAG, "Non-IPv4 default route: " + route); diff --git a/service/java/com/android/server/wifi/util/XmlUtil.java b/service/java/com/android/server/wifi/util/XmlUtil.java index 5f6b9abc1..1093a9612 100644 --- a/service/java/com/android/server/wifi/util/XmlUtil.java +++ b/service/java/com/android/server/wifi/util/XmlUtil.java @@ -902,7 +902,8 @@ public class XmlUtil { InetAddress gateway = NetworkUtils.numericToInetAddress(gatewayAddressString); RouteInfo route = new RouteInfo(null, gateway, null, RouteInfo.RTN_UNICAST); - if (route.isIPv4Default()) { + if (route.isDefaultRoute() + && route.getDestination().getAddress() instanceof Inet4Address) { builder.setGateway(gateway); } else { Log.w(TAG, "Non-IPv4 default route: " + route); |