drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2014-11-26 21:27:16 +00:00
committed by Android (Google) Code Review
parent ca84c8b1b0 57d766f533
commit bc3226e21d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/AudioManager.java
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);