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

Commit 90e09087 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "ConnectivityService: Grant networkstack uid extra privileges" am:... 

Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 04665dbf am: 24487ef5 am: 2d8ed7ed
am: f8f40f74

Change-Id: I3620f018e5a1c203385f2997a42ff4a9e536f735
parents 183536f5 f8f40f74

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

+2 −1
Original line number Diff line number Diff line
@@ -3268,7 +3268,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        final NetworkRequestInfo nri = mNetworkRequests.get(request);



        if (nri != null) {

            if (Process.SYSTEM_UID != callingUid && nri.mUid != callingUid) {

            if (Process.SYSTEM_UID != callingUid && Process.NETWORK_STACK_UID != callingUid

                    && nri.mUid != callingUid) {

                log(String.format("UID %d attempted to %s for unowned request %s",

                        callingUid, requestedOperation, nri));

                return null;