PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250 am: 201429b683 am: 4589965ebd am: 1516f4e8bb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a9c95987b00ab90984677cbef59cdb8ed36a7c9
This commit is contained in:
Chiachang Wang
2021-03-15 12:11:57 +00:00
committed by Automerger Merge Worker
parent 0e7694902d 1516f4e8bb
commit d8dee32e02
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/AdbIpAddressPreferenceController.java
View File

@@ -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);
}