commit 52d7b73c0d1021de69f580abf9841a0986f8305a
author Chalard Jean <jchalard@google.com> Mon Mar 01 22:12:56 2021 +0900
committer Chalard Jean <jchalard@google.com> Thu Mar 04 22:08:09 2021 +0900
tree eda159feb3a4ddf3ac6f459f28641b6b98e81235
parent 07dc18662abd0794103e41812e9b675bfc44bff0

Fix a bug where a request would not be refcounted

This ends up crashing the system when the request
is unregistered, because the ref counter finds the
count associated with the relevant UID is zero.

Test: FrameworksNetTests
Test: TODO : this needs a new unit test
Change-Id: I0ee0ce925a826d35d8fd58cefb8a870e98ce9add

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 12b094e..2b6523a 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5259,6 +5259,7 @@
             mPid = nri.mPid;
             mUid = nri.mUid;
             mPendingIntent = nri.mPendingIntent;
+            mNetworkRequestCounter.incrementCountOrThrow(mUid);
             mCallingAttributionTag = nri.mCallingAttributionTag;
         }