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

Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" am: e89170bcb1 am: 23756bef7d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927304

Change-Id: I195f88ec1b5ced5ffe6bcef7361f58bd309741ea
This commit is contained in:
Ayush Sharma
2021-12-16 15:39:55 +00:00
committed by Automerger Merge Worker
parent 6c75679f1d 23756bef7d
commit 626bac0e8c
4 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/api/current.txt
View File

@@ -439,15 +439,11 @@ package android.net {
method @NonNull public android.net.IpPrefix getDestination();
method @Nullable public java.net.InetAddress getGateway();
method @Nullable public String getInterface();
method public int getType();
method public boolean hasGateway();
method public boolean isDefaultRoute();
method public boolean matches(java.net.InetAddress);
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.RouteInfo> CREATOR;
field public static final int RTN_THROW = 9; // 0x9
field public static final int RTN_UNICAST = 1; // 0x1
field public static final int RTN_UNREACHABLE = 7; // 0x7
}
public abstract class SocketKeepalive implements java.lang.AutoCloseable {

4
framework/api/system-current.txt
View File

@@ -432,6 +432,10 @@ package android.net {
ctor public RouteInfo(@Nullable android.net.IpPrefix, @Nullable java.net.InetAddress, @Nullable String, int);
ctor public RouteInfo(@Nullable android.net.IpPrefix, @Nullable java.net.InetAddress, @Nullable String, int, int);
method public int getMtu();
method public int getType();
field public static final int RTN_THROW = 9; // 0x9
field public static final int RTN_UNICAST = 1; // 0x1
field public static final int RTN_UNREACHABLE = 7; // 0x7
}
public abstract class SocketKeepalive implements java.lang.AutoCloseable {

25
framework/src/android/net/RouteInfo.java
View File

@@ -86,26 +86,16 @@ public final class RouteInfo implements Parcelable {
private final String mInterface;
/**
* Unicast route.
*
* Indicates that destination is reachable directly or via gateway.
**/
/** Unicast route. @hide */
@SystemApi
public static final int RTN_UNICAST = 1;
/**
* Unreachable route.
*
* Indicates that destination is unreachable.
**/
/** Unreachable route. @hide */
@SystemApi
public static final int RTN_UNREACHABLE = 7;
/**
* Throw route.
*
* Indicates that routing information about this destination is not in this table.
* Routing lookup should continue in another table.
**/
/** Throw route. @hide */
@SystemApi
public static final int RTN_THROW = 9;
/**
@@ -401,7 +391,10 @@ public final class RouteInfo implements Parcelable {
* Retrieves the type of this route.
*
* @return The type of this route; one of the {@code RTN_xxx} constants defined in this class.
*
* @hide
*/
@SystemApi
@RouteType
public int getType() {
return mType;

12
tests/common/java/android/net/RouteInfoTest.java
View File

@@ -16,8 +16,6 @@
package android.net;
import static android.net.RouteInfo.RTN_THROW;
import static android.net.RouteInfo.RTN_UNICAST;
import static android.net.RouteInfo.RTN_UNREACHABLE;
import static com.android.testutils.MiscAsserts.assertEqualBothWays;
@@ -330,16 +328,6 @@ public class RouteInfoTest {
}
}
@Test
public void testRouteTypes() {
RouteInfo r = new RouteInfo(new IpPrefix(Inet6Address.ANY, 0), RTN_UNREACHABLE);
assertEquals(RTN_UNREACHABLE, r.getType());
r = new RouteInfo(new IpPrefix(Inet6Address.ANY, 0), RTN_UNICAST);
assertEquals(RTN_UNICAST, r.getType());
r = new RouteInfo(new IpPrefix(Inet6Address.ANY, 0), RTN_THROW);
assertEquals(RTN_THROW, r.getType());
}
@Test
public void testTruncation() {
LinkAddress l;