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

Commit c5c47be1 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: a8f74e30 

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

Change-Id: I5b6a900611b727ee58a5b1f2762ed10b5a24fe44
parents 69bac978 a8f74e30

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;

        }