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

Commit 4589965e authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Replace the hidden getActiveLinkProperties usage" am: d709b552 am: 201429b6 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0118ce1ed80dd4b672e98f8a7a905d42462f24f
parents 62fd4e85 201429b6

src/com/android/settings/development/AdbIpAddressPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer 
     * @return the formatted and newline-separated IP addresses, or null if none.

     */

    private static String getDefaultIpAddresses(ConnectivityManager cm) {

        LinkProperties prop = cm.getActiveLinkProperties();

        LinkProperties prop = cm.getLinkProperties(cm.getActiveNetwork());

        return formatIpAddresses(prop);

    }