Merge "Allow NetworkRequest release from the system process." into lmp-dev

This commit is contained in:
Jeff Davidson
2014-08-22 16:52:27 +00:00
committed by Android (Google) Code Review

View File

@@ -2160,7 +2160,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private void handleReleaseNetworkRequest(NetworkRequest request, int callingUid) { private void handleReleaseNetworkRequest(NetworkRequest request, int callingUid) {
NetworkRequestInfo nri = mNetworkRequests.get(request); NetworkRequestInfo nri = mNetworkRequests.get(request);
if (nri != null) { if (nri != null) {
if (nri.mUid != callingUid) { if (Process.SYSTEM_UID != callingUid && nri.mUid != callingUid) {
if (DBG) log("Attempt to release unowned NetworkRequest " + request); if (DBG) log("Attempt to release unowned NetworkRequest " + request);
return; return;
} }