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

Filter out excluded routes in LinkProperties

Browse Source 
Gate presence of excluded routes in LinkProperties on target sdk T.

Bug: 186082280
Test: atest LinkPropertiesTest
Change-Id: If8fdb468a0a4968c5f2a878b7aacfeb4f7d9a9e5
This commit is contained in:
Taras Antoshchuk
2021-08-02 18:06:35 +02:00
parent bebd8b0b54
commit 30d41e59bc
5 changed files with 86 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
framework/src/android/net/LinkProperties.java
View File

@@ -19,12 +19,16 @@ package android.net;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter;
import android.compat.annotation.UnsupportedAppUsage;
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
import com.android.net.module.util.LinkPropertiesUtils;
import java.net.Inet4Address;
@@ -38,6 +42,7 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Objects;
import java.util.StringJoiner;
import java.util.stream.Collectors;
/**
* Describes the properties of a network link.
@@ -52,6 +57,17 @@ import java.util.StringJoiner;
*
*/
public final class LinkProperties implements Parcelable {
/**
* The {@link #getRoutes()} now can contain excluded as well as included routes. Use
* {@link RouteInfo#getType()} to determine route type.
*
* @hide
*/
@ChangeId
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.S) // Switch to S_V2 when it is available.
@VisibleForTesting
public static final long EXCLUDED_ROUTES = 186082280;
// The interface described by the network link.
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
private String mIfaceName;
@@ -738,10 +754,25 @@ public final class LinkProperties implements Parcelable {
/**
* Returns all the {@link RouteInfo} set on this link.
*
* Only unicast routes are returned for apps targeting Android S or below.
*
* @return An unmodifiable {@link List} of {@link RouteInfo} for this link.
*/
public @NonNull List<RouteInfo> getRoutes() {
return Collections.unmodifiableList(mRoutes);
if (CompatChanges.isChangeEnabled(EXCLUDED_ROUTES)) {
return Collections.unmodifiableList(mRoutes);
} else {
return Collections.unmodifiableList(getUnicastRoutes());
}
}
/**
* Returns all the {@link RouteInfo} of type {@link RouteInfo#RTN_UNICAST} set on this link.
*/
private @NonNull List<RouteInfo> getUnicastRoutes() {
return mRoutes.stream()
.filter(route -> route.getType() == RouteInfo.RTN_UNICAST)
.collect(Collectors.toList());
}
/**
@@ -757,11 +788,14 @@ public final class LinkProperties implements Parcelable {
/**
* Returns all the routes on this link and all the links stacked above it.
*
* Only unicast routes are returned for apps targeting Android S or below.
*
* @hide
*/
@SystemApi
public @NonNull List<RouteInfo> getAllRoutes() {
List<RouteInfo> routes = new ArrayList<>(mRoutes);
final List<RouteInfo> routes = new ArrayList<>(getRoutes());
for (LinkProperties stacked: mStackedLinks.values()) {
routes.addAll(stacked.getAllRoutes());
}