diff options
| author | Nick Kralevich <nnk@google.com> | 2013-06-19 15:35:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-19 15:35:48 +0000 |
| commit | b1c5945a5598263fe63f3d665f575ba736eb26d2 (patch) | |
| tree | c50069054c3d62dabc41fe3bb309a621f1e4e7b5 | |
| parent | 03ce9b3e69f1eec85e7e7cbfd65bb9093e74cea8 (diff) | |
| parent | 1b2d59500a8c066dec413f906c480ee46f004df5 (diff) | |
| download | frameworks_base-b1c5945a5598263fe63f3d665f575ba736eb26d2.zip frameworks_base-b1c5945a5598263fe63f3d665f575ba736eb26d2.tar.gz frameworks_base-b1c5945a5598263fe63f3d665f575ba736eb26d2.tar.bz2 | |
Merge "NativeCrashListener: fix file descriptor leak."
| -rw-r--r-- | services/java/com/android/server/am/NativeCrashListener.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/NativeCrashListener.java b/services/java/com/android/server/am/NativeCrashListener.java index 307ab03..2c7f1f1 100644 --- a/services/java/com/android/server/am/NativeCrashListener.java +++ b/services/java/com/android/server/am/NativeCrashListener.java @@ -152,6 +152,13 @@ final class NativeCrashListener extends Thread { Slog.d(TAG, "Exception writing ack: " + e.getMessage()); } } + try { + Libcore.os.close(peerFd); + } catch (ErrnoException e) { + if (MORE_DEBUG) { + Slog.d(TAG, "Exception closing socket: " + e.getMessage()); + } + } } } } |