am e6f856c9: am 0ca68a06: Cleanup of process-specific DNS.

Merge commit 'e6f856c916c172ebd54e40fa11c356845c347ca2'

* commit 'e6f856c916c172ebd54e40fa11c356845c347ca2':
  Cleanup of process-specific DNS.
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 2981599..0f5330b 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -667,8 +667,8 @@
             }
             if (usedNetworkType != networkType) {
                 Integer currentPid = new Integer(pid);
-                reassessPidDns(pid, true);
                 mNetRequestersPids[usedNetworkType].remove(currentPid);
+                reassessPidDns(pid, true);
                 if (mNetRequestersPids[usedNetworkType].size() != 0) {
                     if (DBG) Log.d(TAG, "not tearing down special network - " +
                            "others still using it");