diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-14 17:00:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-14 17:00:01 +0000 |
| commit | 4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9 (patch) | |
| tree | 55d0e14f418700b3351afc121e0fe337c74d6f2a /core | |
| parent | e3179ebc387c8f786db1ad7d3bd5ede038968641 (diff) | |
| parent | d073bfdb3a44f07ef5338306f9b9377532962290 (diff) | |
| download | frameworks_base-4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9.zip frameworks_base-4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9.tar.gz frameworks_base-4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9.tar.bz2 | |
Merge "Use the right fd for flush call" into jb-mr2-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/LocalSocketImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index 8e129cb..3b43c36 100644 --- a/core/java/android/net/LocalSocketImpl.java +++ b/core/java/android/net/LocalSocketImpl.java @@ -147,7 +147,7 @@ class LocalSocketImpl public void flush() throws IOException { FileDescriptor myFd = fd; if (myFd == null) throw new IOException("socket closed"); - while(pending_native(fd) > 0) { + while(pending_native(myFd) > 0) { try { Thread.sleep(10); } catch (InterruptedException ie) { |