commit d83b44d83180dcd6bd91fba64d018bbb04082477
author Android (Google) Code Review <android-gerrit@google.com> Mon Aug 31 19:45:05 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 31 19:45:05 2009 -0700
tree fb2dffa55344227014d5efb95c904021c54f40da
parent 045a8839a17a79b6cb6b061d63d5c0e923f8b946
parent ee794ba5376fbd34dfd9accef0e64a30307edca3

Merge change 23271 into eclair

* changes:
  Cleanup egregious style issues.

libs/audioflinger/AudioFlinger.cpp

diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp
index 77a126c..3a419b5 100644
--- a/libs/audioflinger/AudioFlinger.cpp
+++ b/libs/audioflinger/AudioFlinger.cpp
@@ -136,8 +136,17 @@
 
 AudioFlinger::~AudioFlinger()
 {
-    mRecordThreads.clear();
-    mPlaybackThreads.clear();
+    while (!mRecordThreads.isEmpty()) {
+        // closeInput() will remove first entry from mRecordThreads
+        closeInput(mRecordThreads.keyAt(0));
+    }
+    while (!mPlaybackThreads.isEmpty()) {
+        // closeOutput() will remove first entry from mPlaybackThreads
+        closeOutput(mPlaybackThreads.keyAt(0));
+    }
+    if (mAudioHardware) {
+        delete mAudioHardware;
+    }
 }
 
 

libs/ui/EventHub.cpp

diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp
index df713cb..60c177b 100644
--- a/libs/ui/EventHub.cpp
+++ b/libs/ui/EventHub.cpp
@@ -784,6 +784,7 @@
             int count = mFDCount - i - 1;
             int index = (device->id&ID_MASK);
             mDevicesById[index].device = NULL;
+            close(mFDs[i].fd);
             memmove(mDevices + i, mDevices + i + 1, sizeof(mDevices[0]) * count);
             memmove(mFDs + i, mFDs + i + 1, sizeof(mFDs[0]) * count);