commit d322773f5a712069daa9d29732160e4eaf71c0d0
author Jordan Liu <jminjie@google.com> Wed Aug 07 19:16:13 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 07 19:16:13 2019 +0000
tree e602e32a9e013a6423ced704f5c0799754c69200
parent 1af7a6e8199fc0dcdf9e5e7a41bf93ddccd01433
parent 1c85e7743ac852ea25bde1e98d508c79629f128a

Merge "Do not use isAudioOn hidden API"

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 3796e64..f9013c6 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -392,7 +392,7 @@
             try {
                 int stream;
                 if (mBluetoothHeadset != null) {
-                    stream = mBluetoothHeadset.isAudioOn() ? AudioManager.STREAM_BLUETOOTH_SCO:
+                    stream = isBluetoothAudioOn() ? AudioManager.STREAM_BLUETOOTH_SCO :
                         AudioManager.STREAM_VOICE_CALL;
                 } else {
                     stream = AudioManager.STREAM_VOICE_CALL;
@@ -479,6 +479,11 @@
         }
     }
 
+    // Returns whether there are any connected Bluetooth audio devices
+    private boolean isBluetoothAudioOn() {
+        return mBluetoothHeadset.getConnectedDevices().size() > 0;
+    }
+
     /**
      * Displays a notification when the phone receives a DisplayInfo record.
      */