diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-03-18 15:01:03 +0800 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2021-03-18 14:31:28 +0000 |
| commit | 003e27d146d6d330ad9da09dd82c9960c6ce1d19 (patch) | |
| tree | 63b1a4c5faf569c1f338fd34d645a75d417f476a /src/com/android/settings/development/AdbIpAddressPreferenceController.java | |
| parent | 45726b937b972ca30af660afed7e41c3d00ff4b2 (diff) | |
Remove hidden connectivity methods access
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.
Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
Diffstat (limited to 'src/com/android/settings/development/AdbIpAddressPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/AdbIpAddressPreferenceController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/development/AdbIpAddressPreferenceController.java b/src/com/android/settings/development/AdbIpAddressPreferenceController.java index 45fe51b145..ce5a8513d3 100644 --- a/src/com/android/settings/development/AdbIpAddressPreferenceController.java +++ b/src/com/android/settings/development/AdbIpAddressPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.development; import android.content.Context; import android.debug.IAdbManager; import android.net.ConnectivityManager; +import android.net.LinkAddress; import android.net.LinkProperties; import android.net.wifi.WifiManager; import android.os.RemoteException; @@ -135,7 +136,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer return null; } - Iterator<InetAddress> iter = prop.getAllAddresses().iterator(); + Iterator<LinkAddress> iter = prop.getAllLinkAddresses().iterator(); // If there are no entries, return null if (!iter.hasNext()) { return null; @@ -144,7 +145,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer // Concatenate all available addresses, newline separated StringBuilder addresses = new StringBuilder(); while (iter.hasNext()) { - InetAddress addr = iter.next(); + InetAddress addr = iter.next().getAddress(); if (addr instanceof Inet4Address) { // adb only supports ipv4 at the moment addresses.append(addr.getHostAddress()); |