LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: e18b1c815f

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

Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676
This commit is contained in:
Aaron Huang
2021-05-14 09:44:33 +00:00
committed by Automerger Merge Worker
parent 9f8e6cc2a9 e18b1c815f
commit 872cbed05f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/UnderlyingNetworkInfo.java
View File

@@ -71,13 +71,13 @@ public final class UnderlyingNetworkInfo implements Parcelable {
/** Get the interface name of this network. */ /** Get the interface name of this network. */
@NonNull @NonNull
public String getIface() { public String getInterface() {
return mIface; return mIface;
} }
/** Get the names of the interfaces underlying this network. */ /** Get the names of the interfaces underlying this network. */
@NonNull @NonNull
public List<String> getUnderlyingIfaces() { public List<String> getUnderlyingInterfaces() {
return mUnderlyingIfaces; return mUnderlyingIfaces;
} }
@@ -124,8 +124,8 @@ public final class UnderlyingNetworkInfo implements Parcelable {
if (!(o instanceof UnderlyingNetworkInfo)) return false; if (!(o instanceof UnderlyingNetworkInfo)) return false;
final UnderlyingNetworkInfo that = (UnderlyingNetworkInfo) o; final UnderlyingNetworkInfo that = (UnderlyingNetworkInfo) o;
return mOwnerUid == that.getOwnerUid() return mOwnerUid == that.getOwnerUid()
&& Objects.equals(mIface, that.getIface()) && Objects.equals(mIface, that.getInterface())
&& Objects.equals(mUnderlyingIfaces, that.getUnderlyingIfaces()); && Objects.equals(mUnderlyingIfaces, that.getUnderlyingInterfaces());
} }
@Override @Override

4
services/core/java/com/android/server/net/NetworkStatsFactory.java
View File

@@ -382,8 +382,8 @@ public class NetworkStatsFactory {
// Migrate data usage over a VPN to the TUN network. // Migrate data usage over a VPN to the TUN network.
for (UnderlyingNetworkInfo info : vpnArray) { for (UnderlyingNetworkInfo info : vpnArray) {
delta.migrateTun(info.getOwnerUid(), info.getIface(), delta.migrateTun(info.getOwnerUid(), info.getInterface(),
info.getUnderlyingIfaces()); info.getUnderlyingInterfaces());
// Filter out debug entries as that may lead to over counting. // Filter out debug entries as that may lead to over counting.
delta.filterDebugEntries(); delta.filterDebugEntries();
} }