commit d5c6a891b415a3c1aceac52d80023ff404b19940
author Xiao Ma <xiaom@google.com> Fri Jul 08 06:55:04 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 08 06:55:04 2022 +0000
tree 3869eafbc28ed4f95f44d91a533e963bab92d911
parent 0dce8e551e9ca58ce98a910e22291f912f98a0a2
parent b873e25ab48f0f757c207b194de1ac940ed82320

Merge "Use frameworks/libs/net version of SharedLog"

Tethering/apex/manifest.json

diff --git a/Tethering/apex/manifest.json b/Tethering/apex/manifest.json
index 3cb03ed..5d5ede6 100644
--- a/Tethering/apex/manifest.json
+++ b/Tethering/apex/manifest.json
@@ -1,4 +1,7 @@
 {
   "name": "com.android.tethering",
-  "version": 339990000
+
+  // Placeholder module version to be replaced during build.
+  // Do not change!
+  "version": 0
 }

framework/src/android/net/NetworkProvider.java

diff --git a/framework/src/android/net/NetworkProvider.java b/framework/src/android/net/NetworkProvider.java
index 0665af5..4dd642e 100644
--- a/framework/src/android/net/NetworkProvider.java
+++ b/framework/src/android/net/NetworkProvider.java
@@ -326,7 +326,9 @@
     public void unregisterNetworkOffer(final @NonNull NetworkOfferCallback callback) {
         final NetworkOfferCallbackProxy proxy = findProxyForCallback(callback);
         if (null == proxy) return;
-        mProxies.remove(proxy);
+        synchronized (mProxies) {
+            mProxies.remove(proxy);
+        }
         mContext.getSystemService(ConnectivityManager.class).unofferNetwork(proxy);
     }
 }