| commit | 5d0cc8544879bec827876e457bfd88ca2f60ed4e | [log] [tgz] |
|---|---|---|
| author | Cody Kesting <ckesting@google.com> | Fri Dec 04 17:47:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 17:47:45 2020 +0000 |
| tree | b56a525574fb127db406f424d2d63fcf16dcb9a8 | |
| parent | 1ebf8bfe18cf08190be009826f8e91937c85e687 [diff] | |
| parent | 636f8cbced8e1d4ea2bcd64dc0aea11ebc916040 [diff] |
Merge "Allow the System UID to unregister ConnDiags CBs." am: 636f8cbced Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515688 Change-Id: Ia82d68661c99ed5123f2a0668aec4afd5ea48cf5
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; }