commit 1c85e7743ac852ea25bde1e98d508c79629f128a
author Jordan Liu <jminjie@google.com> Tue Aug 06 16:06:19 2019 -0700
committer Jordan Liu <jminjie@google.com> Tue Aug 06 23:27:24 2019 +0000
tree e602e32a9e013a6423ced704f5c0799754c69200
parent 4e9ab3d3fdd47d017f1867ae5625e9700310905a

Do not use isAudioOn hidden API

Instead we can use BluetoothHeadset.getConnectedDevices and check the
size of the list. This is the same behavior (actually isAudioOn would
have included connecting devices, but we don't include that because we
shouldn't)

Bug: 137202333
Test: manual
Change-Id: I928c5a2e944b74559304ad9337a8d02a59721492

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.
      */