Merge "Remove reference when active listener is unregistered" am: a39b107812

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

Change-Id: I7b05b33c2a0c02c298d42ab4891ce543fe5ab9bd

framework/src/android/net/ConnectivityManager.java

@@ -2335,6 +2335,7 @@ public class ConnectivityManager {
         void onNetworkActive();
     }
 
+    @GuardedBy("mNetworkActivityListeners")
     private final ArrayMap<OnNetworkActiveListener, INetworkActivityListener>
             mNetworkActivityListeners = new ArrayMap<>();
 
@@ -2351,18 +2352,20 @@ public class ConnectivityManager {
      * @param l The listener to be told when the network is active.
      */
     public void addDefaultNetworkActiveListener(final OnNetworkActiveListener l) {
-        INetworkActivityListener rl = new INetworkActivityListener.Stub() {
+        final INetworkActivityListener rl = new INetworkActivityListener.Stub() {
             @Override
             public void onNetworkActive() throws RemoteException {
                 l.onNetworkActive();
             }
         };
 
-        try {
+        synchronized (mNetworkActivityListeners) {
-            mService.registerNetworkActivityListener(rl);
+            try {
-            mNetworkActivityListeners.put(l, rl);
+                mService.registerNetworkActivityListener(rl);
-        } catch (RemoteException e) {
+                mNetworkActivityListeners.put(l, rl);
-            throw e.rethrowFromSystemServer();
+            } catch (RemoteException e) {
+                throw e.rethrowFromSystemServer();
+            }
         }
     }
 
@@ -2373,14 +2376,17 @@ public class ConnectivityManager {
      * @param l Previously registered listener.
      */
     public void removeDefaultNetworkActiveListener(@NonNull OnNetworkActiveListener l) {
-        INetworkActivityListener rl = mNetworkActivityListeners.get(l);
+        synchronized (mNetworkActivityListeners) {
-        if (rl == null) {
+            final INetworkActivityListener rl = mNetworkActivityListeners.get(l);
-            throw new IllegalArgumentException("Listener was not registered.");
+            if (rl == null) {
-        }
+                throw new IllegalArgumentException("Listener was not registered.");
-        try {
+            }
-            mService.unregisterNetworkActivityListener(rl);
+            try {
-        } catch (RemoteException e) {
+                mService.unregisterNetworkActivityListener(rl);
-            throw e.rethrowFromSystemServer();
+                mNetworkActivityListeners.remove(l);
+            } catch (RemoteException e) {
+                throw e.rethrowFromSystemServer();
+            }
         }
     }
 

tests/unit/java/android/net/ConnectivityManagerTest.java

@@ -326,6 +326,8 @@ public class ConnectivityManagerTest {
         verify(mService, times(1)).registerNetworkActivityListener(any());
         manager.removeDefaultNetworkActiveListener(listener);
         verify(mService, times(1)).unregisterNetworkActivityListener(any());
+        assertThrows(IllegalArgumentException.class,
+                () -> manager.removeDefaultNetworkActiveListener(listener));
     }
 
     @Test