Commit 662076b1 authored Mar 04, 2020 by Cody Kesting

Decrement networkRequestPerUid when callbacks are unregistered.

ConnectivityDiagnosticsCallbacks are tied to NetworkRequestInfo objects
when registered with the platform. Each NetworkRequestInfo is tied to a
specific uid, and ConnectivityService enforces a limit on the number of
network requests that can be associated with each uid.

When ConnectivityDiagnosticsCallbacks are unregistered from the
platform, their NetworkRequestInfo is freed and the number of network
requests per the user's uid should be decremented.

Bug: 150802582
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest
Change-Id: Ia5ed39c1d8e6221cd402be4f8baf69fa643a6113

parent 95ec0b20

services/core/java/com/android/server/ConnectivityService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -7863,6 +7863,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
		return;
		}

		// Decrement the reference count for this NetworkRequestInfo. The reference count is
		// incremented when the NetworkRequestInfo is created as part of
		// enforceRequestCountLimit().
		decrementNetworkRequestPerUidCount(nri);

		cb.asBinder().unlinkToDeath(mConnectivityDiagnosticsCallbacks.remove(cb), 0);
		}