Migrating Bluetooth resources to Bluetooth module

In order for the Bluetooth module to build as an apex
all non-public resources must be located in the same
package.
Made getMaxConnectedAudioDevices system API in order
for development Settings to access it.
Removed isInbandRingingSupported as only usage was by bt
service (config is now directly in service).
Removed isBluetoothVoiceDialingEnabled as there were no
usages, and no overlays.
All configs used only by the Bluetooth app are moved to
the Bluetooth module.

Tag: #feature
Bug: 211570675
Test: build
Test: make RunSettingsRoboTests
Change-Id: Ieed30c31fc44b5b477d43ae120ef11f96ab115ca

2 files changed, 4 insertions, 25 deletions

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index b70d268dee..8361eb1af3 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -2416,10 +2416,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
@@ -2435,7 +2435,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 1b141c9afa..750e3a8323 100644
--- a/framework/java/android/bluetooth/BluetoothHeadset.java
+++ b/framework/java/android/bluetooth/BluetoothHeadset.java
@@ -911,16 +911,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);
-    }
 
     /**
      * Get the current audio state of the Headset.
@@ -1433,17 +1423,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() {