commit 1093c94a3be298158f13bc371ddc2c5a3f3a1e56
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 13 03:08:57 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 13 03:08:57 2022 +0000
tree adcca9335718ef341cbdbd8123f4945fc36931c9
parent bb5bffd7be1921675f8287e9073514ad9f475030
parent f5b22c846142ab6b7572b4e6aff5d44623922f18

Snap for 8581479 from f5b22c846142ab6b7572b4e6aff5d44623922f18 to tm-qpr1-release

Change-Id: Ie969f59650323990728d3532b92a8bc6ebb85477

apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java

diff --git a/apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java b/apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java
index 7159cea..0dcd0db 100644
--- a/apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java
+++ b/apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java
@@ -40,6 +40,8 @@
     public static final int VPN_PROFILE_STATE_CONNECTING = 1;
     public static final int VPN_PROFILE_STATE_CONNECTED = 2;
 
+    public static final String ACTION_VPN_MANAGER_EVENT = "android.net.action.VPN_MANAGER_EVENT";
+
     // Constants defined in android.net.ConnectivityDiagnosticsManager.
     public static final int DETECTION_METHOD_DNS_EVENTS = 1;
     public static final int DETECTION_METHOD_TCP_METRICS = 2;

src/android/net/ip/IpClientLinkObserver.java

diff --git a/src/android/net/ip/IpClientLinkObserver.java b/src/android/net/ip/IpClientLinkObserver.java
index b1dbabd..f0126e6 100644
--- a/src/android/net/ip/IpClientLinkObserver.java
+++ b/src/android/net/ip/IpClientLinkObserver.java
@@ -21,6 +21,7 @@
 import static android.system.OsConstants.AF_UNSPEC;
 import static android.system.OsConstants.IFF_LOOPBACK;
 
+import static com.android.modules.utils.build.SdkLevel.isAtLeastT;
 import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ROUTER_ADVERTISEMENT;
 import static com.android.net.module.util.netlink.NetlinkConstants.IFF_LOWER_UP;
 import static com.android.net.module.util.netlink.NetlinkConstants.RTM_F_CLONED;
@@ -203,7 +204,7 @@
 
     private boolean isNetlinkEventParsingEnabled() {
         return mDependencies.isFeatureEnabled(mContext, IPCLIENT_PARSE_NETLINK_EVENTS_VERSION,
-                false /* default value */);
+                isAtLeastT() /* default value */);
     }
 
     @Override