diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-02-14 08:46:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-14 08:46:28 -0800 |
| commit | 9678c61fecfafea3818e7b020e9723bd1c287bb3 (patch) | |
| tree | 15299f7277587dc735180c0eac71594c639ff908 | |
| parent | ac30688b0ab0328ecf79de9743f590509a6f4388 (diff) | |
| parent | fd869887c3477bb2699b72ea752a8466602ea637 (diff) | |
| download | frameworks_base-9678c61fecfafea3818e7b020e9723bd1c287bb3.zip frameworks_base-9678c61fecfafea3818e7b020e9723bd1c287bb3.tar.gz frameworks_base-9678c61fecfafea3818e7b020e9723bd1c287bb3.tar.bz2 | |
am fd869887: Merge "Fix a permissions probem in ConnectivityManager"
# Via Android (Google) Code Review (1) and Robert Greenwalt (1)
* commit 'fd869887c3477bb2699b72ea752a8466602ea637':
Fix a permissions probem in ConnectivityManager
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 8 |
1 files changed, 7 insertions, 1 deletions
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 @@ public class ConnectivityService extends IConnectivityManager.Stub { 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) { |