commit b896efdcfe32b53e2c503415682191f567957d22
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 12 03:17:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 12 03:17:40 2017 +0000
tree 62b5dc81eb966cdb725315429a2339bc5ec6e88b
parent e9b20c2c494462ae5b926ce29ba9a18847ccac98
parent 654afa04273ca78f2d61b21dd04aaf54f3bb051e

Merge "Audio policy: use SPEAKER_SAFE device for alarms and ringtones"

services/audiopolicy/enginedefault/src/Engine.cpp

diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
index 096ffd1..b6fff8c 100644
--- a/services/audiopolicy/enginedefault/src/Engine.cpp
+++ b/services/audiopolicy/enginedefault/src/Engine.cpp
@@ -552,6 +552,15 @@
                 AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED)) {
             device &= ~AUDIO_DEVICE_OUT_SPEAKER;
         }
+
+        // for STRATEGY_SONIFICATION:
+        // if SPEAKER was selected, and SPEAKER_SAFE is available, use SPEAKER_SAFE instead
+        if ((strategy == STRATEGY_SONIFICATION) &&
+                (device & AUDIO_DEVICE_OUT_SPEAKER) &&
+                (availableOutputDevicesType & AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
+            device |= AUDIO_DEVICE_OUT_SPEAKER_SAFE;
+            device &= ~AUDIO_DEVICE_OUT_SPEAKER;
+        }
         } break;
 
     default: