diff options
| author | Etienne Ruffieux <eruffieux@google.com> | 2022-01-25 14:44:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-25 14:44:55 +0000 |
| commit | 2b17efdfabf0d95aa91085f5eb0e5f30587cd38d (patch) | |
| tree | b40fa31931765f5302264da15041f534dfd9f72c /framework/java/android/bluetooth | |
| parent | c27d82992a07dbf0d32822c08fe55569966379fa (diff) | |
| parent | 41f1eda6e596851a13010b3449d7275b95945fa3 (diff) | |
Migrating Bluetooth resources to Bluetooth module am: 46f0869e44 am: 41f1eda6e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1931007
Change-Id: I52f03a6990812293eb417c0c52330daf14c02bcd
Diffstat (limited to 'framework/java/android/bluetooth')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 8 | ||||
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothHeadset.java | 21 |
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() { |