2 files changed, 4 insertions, 25 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index f302da12a8..1700254ba7 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -2397,10 +2397,10 @@ public final class BluetoothAdapter {
     }
 
     /**
-     * Get the maximum number of connected audio devices.
+     * Get the maximum number of connected devices per audio profile for this device.
      *
-     * @return the maximum number of connected audio devices
-     * @hide
+     * @return the number of allowed simultaneous connected devices for each audio profile
+     *         for this device, or -1 if the Bluetooth service can't be reached
      */
     @RequiresLegacyBluetoothPermission
     @RequiresBluetoothConnectPermission
@@ -2416,7 +2416,7 @@ public final class BluetoothAdapter {
         } finally {
             mServiceLock.readLock().unlock();
         }
-        return 1;
+        return -1;
     }
 
     /**
diff --git a/framework/java/android/bluetooth/BluetoothHeadset.java b/framework/java/android/bluetooth/BluetoothHeadset.java
index 91449df0f4..f4fcf1dff6 100644
--- a/framework/java/android/bluetooth/BluetoothHeadset.java
+++ b/framework/java/android/bluetooth/BluetoothHeadset.java
@@ -887,16 +887,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
         return defaultValue;
     }
 
-    /**
-     * Indicates if current platform supports voice dialing over bluetooth SCO.
-     *
-     * @return true if voice dialing over bluetooth is supported, false otherwise.
-     * @hide
-     */
-    public static boolean isBluetoothVoiceDialingEnabled(Context context) {
-        return context.getResources().getBoolean(
-                com.android.internal.R.bool.config_bluetooth_sco_off_call);
-    }
 
     /** @hide */
     @Retention(RetentionPolicy.SOURCE)
@@ -1450,17 +1440,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
         return defaultValue;
     }
 
-    /**
-     * Check if in-band ringing is supported for this platform.
-     *
-     * @return true if in-band ringing is supported, false if in-band ringing is not supported
-     * @hide
-     */
-    public static boolean isInbandRingingSupported(Context context) {
-        return context.getResources().getBoolean(
-                com.android.internal.R.bool.config_bluetooth_hfp_inband_ringing_support);
-    }
-
     @SuppressLint("AndroidFrameworkBluetoothPermission")
     private final IBluetoothProfileServiceConnection mConnection =
             new IBluetoothProfileServiceConnection.Stub() {