Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4787c9bc authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge "Allow the System UID to unregister ConnDiags CBs." am: fcb4e29a am:... 

Merge "Allow the System UID to unregister ConnDiags CBs." am: fcb4e29a am: a8f74e30 am: c5c47be1

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

Change-Id: I123cfe5c1ea8d6f466bf831e87a8a11f8cf12e25
parents 5511a518 c5c47be1

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

+4 −2
Original line number Diff line number Diff line
@@ -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;

        }