commit 33756a9b7860f3d2efd16c2936913cd841711cfd
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 01 09:59:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 01 09:59:14 2021 +0000
tree 29daf4e0c23f20a79d045fe27cbdd805f6b160e4
parent b95a6470fe5f6e6de44e77d9704032d7f8bf0c3e
parent acd508467bd0cc27a546f6d80af0d231eb742fde

Merge "Read URLs from handler thread"

apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java

diff --git a/apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java b/apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java
index 201b5d8..46de698 100644
--- a/apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java
+++ b/apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java
@@ -39,7 +39,6 @@
 public class ConnectivityManagerShimImpl
         extends com.android.networkstack.apishim.api30.ConnectivityManagerShimImpl  {
 
-    @RequiresApi(Build.VERSION_CODES.S)
     protected ConnectivityManagerShimImpl(Context context) {
         super(context);
     }

apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java

diff --git a/apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java b/apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java
index 29b2e0f..f5c839c 100644
--- a/apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java
+++ b/apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java
@@ -36,7 +36,6 @@
 @RequiresApi(Build.VERSION_CODES.S)
 public class NetworkRequestShimImpl
         extends com.android.networkstack.apishim.api30.NetworkRequestShimImpl {
-    @RequiresApi(Build.VERSION_CODES.S)
     protected NetworkRequestShimImpl() {
         super();
     }

src/android/net/ip/IpClient.java

diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java
index 6746680..12ab3fd 100644
--- a/src/android/net/ip/IpClient.java
+++ b/src/android/net/ip/IpClient.java
@@ -906,6 +906,7 @@
 
     private void stopStateMachineUpdaters() {
         mObserverRegistry.unregisterObserver(mLinkObserver);
+        mLinkObserver.clearInterfaceParams();
         mLinkObserver.shutdown();
     }
 
@@ -1969,7 +1970,6 @@
             mHasDisabledIpv6OrAcceptRaOnProvLoss = false;
             mGratuitousNaTargetAddresses.clear();
 
-            mLinkObserver.clearInterfaceParams();
             resetLinkProperties();
             if (mStartTimeMillis > 0) {
                 // Completed a life-cycle; send a final empty LinkProperties