commit 222d91c66bf586e48414aa7224e769759dddc814
author Jeff Davidson <jpd@google.com> Fri Aug 22 16:52:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 22 16:52:33 2014 +0000
tree e7265c376b6cee4c86857492b8047ac9b5330102
parent 9f1f10b15566a02e8bc6b4ca033e469c567b5f2d
parent 7af793a5c3174818643025d3f817c5123b6e140c

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

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 1005bd7..7655e92 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2160,7 +2160,7 @@
     private void handleReleaseNetworkRequest(NetworkRequest request, int callingUid) {
         NetworkRequestInfo nri = mNetworkRequests.get(request);
         if (nri != null) {
-            if (nri.mUid != callingUid) {
+            if (Process.SYSTEM_UID != callingUid && nri.mUid != callingUid) {
                 if (DBG) log("Attempt to release unowned NetworkRequest " + request);
                 return;
             }