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

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

Browse Source 
* 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
parent e986817a2d c69c8dc159
commit f657463a50
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);