| commit | b7c7b51c85554174ee64499399e28db27eb2c6ff | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Wed Oct 03 06:59:50 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Wed Oct 03 06:59:50 2012 -0700 |
| tree | 640f655cd595f82ace4684488b369de235fb5ac8 | |
| parent | 5f24fd93afdcc66bfd9246a0e0000c0fd7283b7f [diff] | |
| parent | 9f99e382ef161dda2ff137ea8be80f26f150399e [diff] |
merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/alsa_sound/AudioStreamOutALSA.cpp b/alsa_sound/AudioStreamOutALSA.cpp index c9ea6b5..49c0581 100644 --- a/alsa_sound/AudioStreamOutALSA.cpp +++ b/alsa_sound/AudioStreamOutALSA.cpp
@@ -185,7 +185,7 @@ if(mHandle->handle == NULL) { ALOGE("write:: device open failed"); mParent->mLock.unlock(); - return 0; + return bytes; } #ifdef QCOM_USBAUDIO_ENABLED if((mHandle->devices == AudioSystem::DEVICE_IN_ANLG_DOCK_HEADSET)||