commit d765cd646e2b22f95c840426926127a714b8dc94
author The Android Automerger <android-build@android.com> Wed Oct 10 08:55:59 2012 -0700
committer The Android Automerger <android-build@android.com> Wed Oct 10 08:55:59 2012 -0700
tree bf0f47848a330918eece8f756ab9cf51eb687f4c
parent 89c224e298fd280a3f2a69da8cc930ff6d036e18
parent 4fea7c7372bec27a4489e511dcdd7f24bdd1fc2a

merge in jb-mr1-factory-release history after reset to jb-mr1-dev

alsa_sound/AudioStreamInALSA.cpp

diff --git a/alsa_sound/AudioStreamInALSA.cpp b/alsa_sound/AudioStreamInALSA.cpp
index 031d477..3b66c24 100644
--- a/alsa_sound/AudioStreamInALSA.cpp
+++ b/alsa_sound/AudioStreamInALSA.cpp
@@ -435,6 +435,13 @@
                 }
                 else
                     mHandle->module->open(mHandle);
+
+                if(mHandle->handle == NULL) {
+                   ALOGE("read:: PCM device re-open failed");
+                   mParent->mLock.unlock();
+                   return 0;
+                }
+
                 mParent->mLock.unlock();
                 continue;
             }

alsa_sound/AudioStreamOutALSA.cpp

diff --git a/alsa_sound/AudioStreamOutALSA.cpp b/alsa_sound/AudioStreamOutALSA.cpp
index d047cd4..2adb5d8 100644
--- a/alsa_sound/AudioStreamOutALSA.cpp
+++ b/alsa_sound/AudioStreamOutALSA.cpp
@@ -260,8 +260,12 @@
                      mHandle->rxHandle = NULL;
                      mHandle->module->startVoipCall(mHandle);
                 }
-                else {
+                else
                     mHandle->module->open(mHandle);
+                if(mHandle->handle == NULL) {
+                   ALOGE("write:: device re-open failed");
+                   mParent->mLock.unlock();
+                   return bytes;
                 }
             }
             mParent->mLock.unlock();