am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev

* commit 'c69c8dc15972179728932f91dde483e9d61f34a9':
  Do not perform forceVolumeControlStream in master volume mode
This commit is contained in:
Jinsuk Kim
2014-11-26 21:39:08 +00:00
committed by Android Git Automerger

View File

@ -1245,6 +1245,9 @@ public class AudioManager {
* @hide * @hide
*/ */
public void forceVolumeControlStream(int streamType) { public void forceVolumeControlStream(int streamType) {
if (mUseMasterVolume) {
return;
}
IAudioService service = getService(); IAudioService service = getService();
try { try {
service.forceVolumeControlStream(streamType, mICallBack); service.forceVolumeControlStream(streamType, mICallBack);