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

Commit e64e4d52 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Remove NETWORK_STACK_UID check" am: 7044a8f3 am: 9b45108b 

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

Change-Id: I82eec664bd11bfb713e52c08fc38dc49dec973c4
parents d29ed707 9b45108b

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

+1 −2
Original line number Diff line number Diff line
@@ -3806,8 +3806,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                ? mNetworkRequests.get(request) : getNriForAppRequest(request);



        if (nri != null) {

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

                    && nri.mUid != callingUid) {

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

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

                        callingUid, requestedOperation, nri));

                return null;