Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 9d450f632f am: 7fb8a1925b am: 8b02f2a4d4

am: 1b4e95a0f1

Change-Id: I3620f018e5a1c203385f2997a42ff4a9e536f735
This commit is contained in:
Roshan Pius
2019-10-07 20:57:56 -07:00
committed by android-build-merger

View File

@@ -3268,7 +3268,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
final NetworkRequestInfo nri = mNetworkRequests.get(request); final NetworkRequestInfo nri = mNetworkRequests.get(request);
if (nri != null) { 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", log(String.format("UID %d attempted to %s for unowned request %s",
callingUid, requestedOperation, nri)); callingUid, requestedOperation, nri));
return null; return null;