summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2018-10-16 18:17:20 -0700
committer android-build-merger <android-build-merger@google.com> 2018-10-16 18:17:20 -0700
commitcf7cca0a436c43e0fc7c5ef0222ad8d9e3705159 (patch)
tree3bc680778d00ac3eb54d7fdda87c0155534aace6
parent59c8b87ad4a1629f685f771fa7582fc9c7ac60d4 (diff)
parent9872b257cd0ca89c95f322ceb7aad24349672d21 (diff)
Merge "audio: apply volume upon hearing aid device connection" into pi-dev
am: 9872b257cd Change-Id: Ibb0a31b7e4750e904568d328384983979cf774a0
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 3ce64cf29707..0c4332ba7899 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -5950,6 +5950,9 @@ public class AudioService extends IAudioService.Stub
address));
sendMsg(mAudioHandler, MSG_ACCESSORY_PLUG_MEDIA_UNMUTE, SENDMSG_QUEUE,
AudioSystem.DEVICE_OUT_HEARING_AID, 0, null, 0);
+ sendMsg(mAudioHandler, MSG_SET_DEVICE_VOLUME, SENDMSG_QUEUE,
+ AudioSystem.DEVICE_OUT_HEARING_AID, 0,
+ mStreamStates[AudioSystem.STREAM_MUSIC], 0);
}
// must be called synchronized on mConnectedDevices