Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[b/109850442]Fail to adjust volume when connect Ampplifier.]" am: 36ee8e0244

Browse Source 
am: 1506f83f4f

Change-Id: I61ce181f8800331900926bcc29d5a066e183feef
This commit is contained in:
Jean-Michel Trivi
2019-01-18 16:39:11 -08:00
committed by android-build-merger
parent b67858ba35 1506f83f4f
commit 61e22fedde
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -1574,7 +1574,9 @@ public class AudioService extends IAudioService.Stub
// For notifications/ring, show the ui before making any adjustments // For notifications/ring, show the ui before making any adjustments
// Don't suppress mute/unmute requests // Don't suppress mute/unmute requests
if (mVolumeController.suppressAdjustment(resolvedStream, flags, isMute)) { // Don't suppress adjustments for single volume device
if (mVolumeController.suppressAdjustment(resolvedStream, flags, isMute)
&& !mIsSingleVolume) {
direction = 0; direction = 0;
flags &= ~AudioManager.FLAG_PLAY_SOUND; flags &= ~AudioManager.FLAG_PLAY_SOUND;
flags &= ~AudioManager.FLAG_VIBRATE; flags &= ~AudioManager.FLAG_VIBRATE;