Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 0bb25f4be7 am: bc1ff193a2

am: 741cf8563c

Change-Id: Ib7c3190806733244672a38822febd7f2d37195b6
This commit is contained in:
Roshan Pius
2019-10-07 20:50:45 -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);
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;