Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2332e55 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge \\"ConnectivityManager: no double callback remove\\" into nyc-mr1-dev am: 78feae88

am: a965203d

Change-Id: I8fb5bac2bb6b7665192c8c788d7818d637500935
parents b5a1d804 a965203d
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -3125,14 +3125,11 @@ public class ConnectivityManager {
            throw new IllegalArgumentException("Invalid NetworkCallback");
        }
        try {
            // CallbackHandler will release callback when receiving CALLBACK_RELEASED.
            mService.releaseNetworkRequest(networkCallback.networkRequest);
        } catch (RemoteException e) {
            throw e.rethrowFromSystemServer();
        }

        synchronized (sNetworkCallback) {
            sNetworkCallback.remove(networkCallback.networkRequest);
        }
    }

    /**