commit f0f43a1c2fecc5a26cf5b6470757ceddb58b3e8f
author Tyler Gunn <tgunn@google.com> Tue Nov 21 21:26:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 21 21:26:40 2017 +0000
tree 9c8184478092b8ad5f7c2a5bf9a44782e791c8fc
parent 948bfab80a54f6a5aee99fb3049475b8597bcf62
parent e04538f279e42688207797427665cea7b51aae01

Merge "Add volume to logs when call audio route changes."

src/com/android/server/telecom/CallAudioRouteStateMachine.java

diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
index 580472c..66bcb84 100644
--- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
@@ -213,7 +213,9 @@
                     "Entering state " + getName());
             if (isActive()) {
                 Log.addEvent(mCallsManager.getForegroundCall(),
-                        AUDIO_ROUTE_TO_LOG_EVENT.get(getRouteCode(), LogUtils.Events.AUDIO_ROUTE));
+                        AUDIO_ROUTE_TO_LOG_EVENT.get(getRouteCode(), LogUtils.Events.AUDIO_ROUTE),
+                        getVolumeString()
+                );
             }
         }
 
@@ -301,6 +303,20 @@
         abstract public void updateSystemAudioState();
         abstract public boolean isActive();
         abstract public int getRouteCode();
+
+        private String getVolumeString() {
+            if (mAudioManager == null) {
+                return "";
+            }
+            StringBuilder sb = new StringBuilder();
+            sb.append("Volume: rng=");
+            sb.append(mAudioManager.getStreamVolume(AudioManager.STREAM_RING));
+            sb.append(", call=");
+            sb.append(mAudioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL));
+            sb.append(", bt=");
+            sb.append(mAudioManager.getStreamVolume(AudioManager.STREAM_BLUETOOTH_SCO));
+            return sb.toString();
+        }
     }
 
     class ActiveEarpieceRoute extends EarpieceRoute {