commit 71f4ccdead14616a0ab5abb74db42ec50cce7ddc
author Ritwika Mitra <ritwikam@google.com> Thu Jun 06 13:23:43 2019 -0700
committer Ritwika Mitra <ritwikam@google.com> Thu Jun 06 13:34:55 2019 -0700
tree aeee381b69d7356696698fd5b7de0aa0db4ef2cc
parent 2151cb231d08069ca93fc64e97ffbba6fc8f76b1

Classify FallbackAssistant Audio as USAGE_ASSISTANT

Since FallbackAssistant acts as an Assistant, its volume
should be in the same audio channel as Google Assistant.
This means the same volume slider that modifies GA's
volume should also modify FallbackAssistant's.

Change-Id: I4fe06e509271f4fc8191c0976118831d47974136
Fix: 134394199
Test: Manual

car-assist-client-lib/src/com/android/car/assist/client/tts/TextToSpeechHelper.java

diff --git a/car-assist-client-lib/src/com/android/car/assist/client/tts/TextToSpeechHelper.java b/car-assist-client-lib/src/com/android/car/assist/client/tts/TextToSpeechHelper.java
index f7ca0d2..e0f985e 100644
--- a/car-assist-client-lib/src/com/android/car/assist/client/tts/TextToSpeechHelper.java
+++ b/car-assist-client-lib/src/com/android/car/assist/client/tts/TextToSpeechHelper.java
@@ -17,6 +17,8 @@
 package com.android.car.assist.client.tts;
 
 import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioFocusRequest;
 import android.media.AudioManager;
 import android.os.Handler;
 import android.speech.tts.TextToSpeech;
@@ -73,6 +75,8 @@
     private final TextToSpeechHelper.Listener mListener;
     private final AudioManager.OnAudioFocusChangeListener mNoOpListener = (f) -> { /* NO-OP */ };
     private final AudioManager mAudioManager;
+    private final AudioAttributes mAudioAttributes;
+    private final AudioFocusRequest mAudioFocusRequest;
     private final long mShutdownDelayMillis;
     private TextToSpeechEngine mTextToSpeechEngine;
     private int mInitStatus;
@@ -104,6 +108,14 @@
         // OnInitListener will only set to SUCCESS/ERROR. So we initialize to STOPPED.
         mInitStatus = TextToSpeech.STOPPED;
         mListener = listener;
+        mAudioAttributes =  new AudioAttributes.Builder()
+                .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                .setUsage(AudioAttributes.USAGE_ASSISTANT)
+                .build();
+        mAudioFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT)
+                .setAudioAttributes(mAudioAttributes)
+                .setOnAudioFocusChangeListener(mNoOpListener)
+                .build();
     }
 
     private void maybeInitAndKeepAlive() {
@@ -149,9 +161,7 @@
             /* no-op */
             return true;
         }
-        int result = mAudioManager.requestAudioFocus(mNoOpListener,
-                getStream(),
-                AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
+        int result = mAudioManager.requestAudioFocus(mAudioFocusRequest);
         if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
             return false;
         }
@@ -182,7 +192,7 @@
 
     // wrap call back to listener.onTextToSpeechStopped with adandonAudioFocus.
     private void onTtsStopped(long requestId, boolean error) {
-        mAudioManager.abandonAudioFocus(mNoOpListener);
+        mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest);
         mHandler.post(() -> mListener.onTextToSpeechStopped(requestId, error));
     }