Merge change 23438 into eclair
* changes: Fix issue 2091594: music chirp after disconnecting A2DP.
This commit is contained in:
@@ -1449,6 +1449,8 @@ void AudioFlinger::MixerThread::putTracks(
|
|||||||
int j = activeTracks.indexOf(t);
|
int j = activeTracks.indexOf(t);
|
||||||
if (j >= 0) {
|
if (j >= 0) {
|
||||||
mActiveTracks.add(t);
|
mActiveTracks.add(t);
|
||||||
|
// force buffer refilling and no ramp volume when the track is mixed for the first time
|
||||||
|
t->mFillingUpStatus = Track::FS_FILLING;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3512,10 +3514,11 @@ status_t AudioFlinger::setStreamOutput(uint32_t stream, int output)
|
|||||||
if (tracks.size()) {
|
if (tracks.size()) {
|
||||||
dstThread->putTracks(tracks, activeTracks);
|
dstThread->putTracks(tracks, activeTracks);
|
||||||
}
|
}
|
||||||
dstThread->sendConfigEvent(AudioSystem::STREAM_CONFIG_CHANGED, stream);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dstThread->sendConfigEvent(AudioSystem::STREAM_CONFIG_CHANGED, stream);
|
||||||
|
|
||||||
return NO_ERROR;
|
return NO_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user