commit 7e6d479045f5939f2d49c274c181bcb5a7e33d35
author Jeff Sharkey <jsharkey@android.com> Wed Oct 26 15:37:55 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 26 15:37:55 2011 -0700
tree fd083dec4d83756bb1d988c0195aaa8b90e1ba1b
parent c16a5993cd284f7f123cf13a9dd9789ce7b60237
parent 7e9a64c1d1abda223774d523acd1dbf895f9421b

Merge "Only tag/untag sockets when open." into ics-mr1

dalvik/src/main/java/dalvik/system/SocketTagger.java

diff --git a/dalvik/src/main/java/dalvik/system/SocketTagger.java b/dalvik/src/main/java/dalvik/system/SocketTagger.java
index 0228545..75242ce 100644
--- a/dalvik/src/main/java/dalvik/system/SocketTagger.java
+++ b/dalvik/src/main/java/dalvik/system/SocketTagger.java
@@ -50,11 +50,15 @@
     public abstract void untag(FileDescriptor socketDescriptor) throws SocketException;
 
     public final void tag(Socket socket) throws SocketException {
-        tag(socket.getFileDescriptor$());
+        if (!socket.isClosed()) {
+            tag(socket.getFileDescriptor$());
+        }
     }
 
     public final void untag(Socket socket) throws SocketException {
-        untag(socket.getFileDescriptor$());
+        if (!socket.isClosed()) {
+            untag(socket.getFileDescriptor$());
+        }
     }
 
     /**