Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e am: f23bda53b2

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

Change-Id: I82eec664bd11bfb713e52c08fc38dc49dec973c4
This commit is contained in:
Lucas Lin
2021-03-16 12:44:29 +00:00
committed by Automerger Merge Worker

View File

@@ -3806,8 +3806,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
? mNetworkRequests.get(request) : getNriForAppRequest(request); ? mNetworkRequests.get(request) : getNriForAppRequest(request);
if (nri != null) { if (nri != null) {
if (Process.SYSTEM_UID != callingUid && Process.NETWORK_STACK_UID != callingUid if (Process.SYSTEM_UID != callingUid && nri.mUid != callingUid) {
&& nri.mUid != callingUid) {
log(String.format("UID %d attempted to %s for unowned request %s", log(String.format("UID %d attempted to %s for unowned request %s",
callingUid, requestedOperation, nri)); callingUid, requestedOperation, nri));
return null; return null;