diff options
| author | Roopa Sattiraju <sattiraju@google.com> | 2022-02-15 14:32:33 -0800 |
|---|---|---|
| committer | Dorin Drimus <dorindrimus@google.com> | 2022-02-16 09:18:34 +0000 |
| commit | 3cda0a7c96b1ad4502bdf05ad22c242132bb03d0 (patch) | |
| tree | 8ba24a89c925da37f795cd394465e344878f5b66 /libraries | |
| parent | d266813b9d86c38d076a12e267c787047093f727 (diff) | |
| download | atv-3cda0a7c96b1ad4502bdf05ad22c242132bb03d0.tar.gz | |
Removing @hide BT APIs in ATV code
Bug: 218974237
Test: Compile against the apex
Change-Id: I7838e1dcd6482260e55689cc4e815fd1db369483
Diffstat (limited to 'libraries')
4 files changed, 6 insertions, 20 deletions
diff --git a/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/BluetoothPairer.java b/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/BluetoothPairer.java index f1729a8..3eec90e 100644 --- a/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/BluetoothPairer.java +++ b/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/BluetoothPairer.java @@ -308,9 +308,6 @@ public final class BluetoothPairer { return; } mPairingProfileWrapper.connect(mDevice); - // must set PRIORITY_AUTO_CONNECT or auto-connection will not occur, however this setting - // does not appear to be sticky across a reboot. - mPairingProfileWrapper.setPriority(mDevice, BluetoothProfile.PRIORITY_AUTO_CONNECT); } private void onAdded() { diff --git a/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapper.java b/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapper.java index 09df9f7..ef1cd57 100644 --- a/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapper.java +++ b/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapper.java @@ -32,7 +32,4 @@ public interface PairingProfileWrapper { boolean connect(BluetoothDevice device); boolean disconnect(BluetoothDevice device); - - boolean setPriority(BluetoothDevice device, int priority); - } diff --git a/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapperA2dp.java b/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapperA2dp.java index ef4102b..1284e41 100644 --- a/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapperA2dp.java +++ b/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapperA2dp.java @@ -46,15 +46,12 @@ public class PairingProfileWrapperA2dp implements PairingProfileWrapper { } @Override - public boolean connect(BluetoothDevice device) { return mProxy.connect(device); } - - @Override - public boolean disconnect(BluetoothDevice device) { - return mProxy.disconnect(device); + public boolean connect(BluetoothDevice device) { + return mProxy.setConnectionPolicy(device, BluetoothProfile.CONNECTION_POLICY_ALLOWED); } @Override - public boolean setPriority(BluetoothDevice device, int priority) { - return mProxy.setPriority(device, priority); + public boolean disconnect(BluetoothDevice device) { + return mProxy.setConnectionPolicy(device, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN); } } diff --git a/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapperHidHost.java b/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapperHidHost.java index f5e7548..3387def 100644 --- a/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapperHidHost.java +++ b/libraries/BluetoothServices/src/com/google/android/tv/btservices/pairing/profiles/PairingProfileWrapperHidHost.java @@ -47,16 +47,11 @@ public class PairingProfileWrapperHidHost implements PairingProfileWrapper { @Override public boolean connect(BluetoothDevice device) { - return mProxy.connect(device); + return mProxy.setConnectionPolicy(device, BluetoothProfile.CONNECTION_POLICY_ALLOWED); } @Override public boolean disconnect(BluetoothDevice device) { - return mProxy.disconnect(device); - } - - @Override - public boolean setPriority(BluetoothDevice device, int priority) { - return mProxy.setPriority(device, priority); + return mProxy.setConnectionPolicy(device, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN); } } |