Merge "Remove reference when active listener is unregistered"

framework/src/android/net/ConnectivityManager.java

@@ -2327,6 +2327,7 @@ public class ConnectivityManager {
         void onNetworkActive();
     }
 
+    @GuardedBy("mNetworkActivityListeners")
     private final ArrayMap<OnNetworkActiveListener, INetworkActivityListener>
             mNetworkActivityListeners = new ArrayMap<>();
 
@@ -2343,13 +2344,14 @@ 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();
             }
         };
 
+        synchronized (mNetworkActivityListeners) {
             try {
                 mService.registerNetworkActivityListener(rl);
                 mNetworkActivityListeners.put(l, rl);
@@ -2357,6 +2359,7 @@ public class ConnectivityManager {
                 throw e.rethrowFromSystemServer();
             }
         }
+    }
 
     /**
      * Remove network active listener previously registered with
@@ -2365,16 +2368,19 @@ public class ConnectivityManager {
      * @param l Previously registered listener.
      */
     public void removeDefaultNetworkActiveListener(@NonNull OnNetworkActiveListener l) {
-        INetworkActivityListener rl = mNetworkActivityListeners.get(l);
+        synchronized (mNetworkActivityListeners) {
+            final INetworkActivityListener rl = mNetworkActivityListeners.get(l);
             if (rl == null) {
                 throw new IllegalArgumentException("Listener was not registered.");
             }
             try {
                 mService.unregisterNetworkActivityListener(rl);
+                mNetworkActivityListeners.remove(l);
             } catch (RemoteException e) {
                 throw e.rethrowFromSystemServer();
             }
         }
+    }
 
     /**
      * Return whether the data network is currently active.  An active network means that

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