LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Allow the System UID to unregister ConnDiags CBs." am: 636f8cbced am: 5d0cc85448 am: 785ef9b4cd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515688

Change-Id: I123cfe5c1ea8d6f466bf831e87a8a11f8cf12e25
This commit is contained in:
Cody Kesting
2020-12-04 19:22:05 +00:00
committed by Automerger Merge Worker
parent 1ce3ea3908 785ef9b4cd
commit 6d675b48b2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -8200,8 +8200,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
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;
}