Merge change 20779 into donut
* changes:
DO NOT MERGE. This is merged from master. Fix couple of bugs in the meminfo report. . added the new "/data/dalvik-cache/" to dalvik heap . shortened the starting line's length from 40 to 30 to handle the case where there is no name . fixed the pri/shared for others. It was swapped.
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp
index f5bdeda..da7cc8a 100644
--- a/libs/audioflinger/AudioFlinger.cpp
+++ b/libs/audioflinger/AudioFlinger.cpp
@@ -202,8 +202,8 @@
SortedVector < sp<MixerThread::Track> > tracks;
SortedVector < wp<MixerThread::Track> > activeTracks;
- LOGV_IF(enable, "set output to A2DP\n");
- LOGV_IF(!enable, "set output to hardware audio\n");
+ LOGD_IF(enable, "set output to A2DP\n");
+ LOGD_IF(!enable, "set output to hardware audio\n");
// Transfer tracks playing on MUSIC stream from one mixer to the other
if (enable) {
@@ -212,6 +212,7 @@
} else {
mA2dpMixerThread->getTracks_l(tracks, activeTracks);
mHardwareMixerThread->putTracks_l(tracks, activeTracks);
+ mA2dpMixerThread->mOutput->standby();
}
mA2dpEnabled = enable;
mNotifyA2dpChange = true;