commit 636f8cbced8e1d4ea2bcd64dc0aea11ebc916040
author Cody Kesting <ckesting@google.com> Fri Dec 04 17:35:28 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 04 17:35:28 2020 +0000
tree b56a525574fb127db406f424d2d63fcf16dcb9a8
parent ab2944488fb8b0ecab8710ac78fac277a375d67f
parent 054451e170559e367a2715b261222ae3f5004409

Merge "Allow the System UID to unregister ConnDiags CBs."

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 e0a484f..58f1db3 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -8200,8 +8200,10 @@
 
         final NetworkRequestInfo nri = cbInfo.mRequestInfo;
 
-        if (uid != nri.mUid) {
-            if (VDBG) loge("Different uid than registrant attempting to unregister cb");
+        // Caller's UID must either be the registrants (if they are unregistering) or the System's
+        // (if the Binder died)
+        if (uid != nri.mUid && uid != Process.SYSTEM_UID) {
+            if (DBG) loge("Uid(" + uid + ") not registrant's (" + nri.mUid + ") or System's");
             return;
         }