From d6cba6bdbffdc306dcf0bbbd7fe91dfeb9df1b12 Mon Sep 17 00:00:00 2001
From: Jakub Tyszkowski <jakub.tyszkowski@codecoup.pl>
Date: Mon, 14 Mar 2022 16:09:18 +0000
Subject: hap: Remove HAP features callback

The non-@SystemApi cannot be implemented by the app on error-prone build, but
has to be implemented in the regular build. To compile the app on both this
has to be removed.

Bug: 150670922
Tag: #feature
Test: atest CtsBluetoothTestCases:android.bluetooth.cts.BluetoothHapClientTest BluetoothInstrumentationTests
Sponsor: jpawlowski@
Change-Id: I7ee01d74726f39320f56b36895a1d80a26852014
---
 .../java/android/bluetooth/BluetoothHapClient.java | 23 ----------------------
 1 file changed, 23 deletions(-)

(limited to 'framework/java/android/bluetooth/BluetoothHapClient.java')

diff --git a/framework/java/android/bluetooth/BluetoothHapClient.java b/framework/java/android/bluetooth/BluetoothHapClient.java
index 4d1bd6ac1a..986c4adf14 100644
--- a/framework/java/android/bluetooth/BluetoothHapClient.java
+++ b/framework/java/android/bluetooth/BluetoothHapClient.java
@@ -140,17 +140,6 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
                 @NonNull List<BluetoothHapPresetInfo> presetInfoList,
                 @Status int statusCode);
 
-        /**
-         * Invoked to inform about HA device's feature set.
-         *
-         * @param device remote device
-         * @param hapFeatures the feature set integer with feature bits set. The inidividual bits
-         * are defined by Bluetooth SIG in Hearing Access Service specification.
-         *
-         * @hide
-         */
-        void onHapFeaturesAvailable(@NonNull BluetoothDevice device, @Feature int hapFeatures);
-
         /**
          * Invoked to inform about the failed preset rename attempt.
          *
@@ -223,18 +212,6 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
             }
         }
 
-        @Override
-        public void onHapFeaturesAvailable(@NonNull BluetoothDevice device,
-                @Feature int hapFeatures) {
-            Attributable.setAttributionSource(device, mAttributionSource);
-            for (Map.Entry<BluetoothHapClient.Callback, Executor> callbackExecutorEntry:
-                    mCallbackExecutorMap.entrySet()) {
-                BluetoothHapClient.Callback callback = callbackExecutorEntry.getKey();
-                Executor executor = callbackExecutorEntry.getValue();
-                executor.execute(() -> callback.onHapFeaturesAvailable(device, hapFeatures));
-            }
-        }
-
         @Override
         public void onSetPresetNameFailed(@NonNull BluetoothDevice device, int status) {
             Attributable.setAttributionSource(device, mAttributionSource);
-- 
cgit v1.2.3