commit fd869887c3477bb2699b72ea752a8466602ea637
author Robert Greenwalt <rgreenwalt@google.com> Thu Feb 14 16:43:33 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 14 16:43:33 2013 +0000
tree e235346834e0d61ff3cd78cb594ddef1e6c048b0
parent f0b36c559074718c5e932c20a9931d97d9c061ef
parent 9055ae369774e88cd856fd58305738e28b427b88

Merge "Fix a permissions probem in ConnectivityManager"

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

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 6efe4c5..e3a3ca2 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1315,7 +1315,13 @@
             if (usedNetworkType != networkType) {
                 Integer currentPid = new Integer(pid);
                 mNetRequestersPids[usedNetworkType].remove(currentPid);
-                reassessPidDns(pid, true);
+
+                final long token = Binder.clearCallingIdentity();
+                try {
+                    reassessPidDns(pid, true);
+                } finally {
+                    Binder.restoreCallingIdentity(token);
+                }
                 flushVmDnsCache();
                 if (mNetRequestersPids[usedNetworkType].size() != 0) {
                     if (VDBG) {