commit 482556f24a17bd3e0fa19bcf867392a49645c85f
author Grace Jia <xiaotonj@google.com> Wed Nov 06 18:45:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 06 18:45:41 2019 +0000
tree 66632bd27b0da9472240e9aa42feb19546b9acfc
parent 0582d2ecacf5d2560ea695e33401a3d4a2643c5e
parent b24494071bc3eb2c9702d7fe418a12a00837edd5

Merge "Use IncomingCallFilterGraph to perform incoming call filters."

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

diff --git a/src/com/android/server/telecom/CallRecordingTonePlayer.java b/src/com/android/server/telecom/CallRecordingTonePlayer.java
index 9b1c4a5..999148c 100644
--- a/src/com/android/server/telecom/CallRecordingTonePlayer.java
+++ b/src/com/android/server/telecom/CallRecordingTonePlayer.java
@@ -17,12 +17,14 @@
 package com.android.server.telecom;
 
 import android.content.Context;
+import android.media.AudioAttributes;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.media.AudioRecordingConfiguration;
 import android.media.MediaPlayer;
 import android.os.Handler;
 import android.os.Looper;
+import android.provider.MediaStore;
 import android.telecom.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
@@ -243,6 +245,9 @@
             mRecordingTonePlayer.setLooping(true);
             mRecordingTonePlayer.setPreferredDevice(telephonyDevice);
             mRecordingTonePlayer.setVolume(0.1f);
+            AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION).build();
+            mRecordingTonePlayer.setAudioAttributes(audioAttributes);
             mRecordingTonePlayer.start();
         } else {
             Log.w(this ,"startCallRecordingTone: can't find telephony audio device.");

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

diff --git a/src/com/android/server/telecom/PhoneStateBroadcaster.java b/src/com/android/server/telecom/PhoneStateBroadcaster.java
index a5e3848..533c81c 100644
--- a/src/com/android/server/telecom/PhoneStateBroadcaster.java
+++ b/src/com/android/server/telecom/PhoneStateBroadcaster.java
@@ -114,7 +114,7 @@
 
         try {
             if (mRegistry != null) {
-                mRegistry.notifyCallState(phoneState, callHandle);
+                mRegistry.notifyCallStateForAllSubs(phoneState, callHandle);
                 Log.i(this, "Broadcasted state change: %s", mCurrentState);
             }
         } catch (RemoteException e) {