From 3b38eaa3c2ad33c81be46ba5d685260295447791 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Wed, 9 Aug 2017 00:45:34 -0700 Subject: [PATCH] resolve merge conflicts of 15658662fdde to stage-aosp-master Test: this fixes merge conflict that I skipped Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08 --- Android.mk | 75 +++++++------ .../bluetooth/BluetoothActivityEnergyInfo.aidl | 19 ---- .../android/bluetooth/BluetoothAudioConfig.aidl | 19 ---- .../bluetooth/BluetoothAvrcpPlayerSettings.aidl | 19 ---- .../android/bluetooth/BluetoothCodecConfig.aidl | 19 ---- .../android/bluetooth/BluetoothCodecStatus.aidl | 19 ---- core/java/android/bluetooth/BluetoothDevice.aidl | 19 ---- .../bluetooth/BluetoothGattCharacteristic.aidl | 19 ---- .../android/bluetooth/BluetoothGattDescriptor.aidl | 19 ---- .../bluetooth/BluetoothGattIncludedService.aidl | 19 ---- .../android/bluetooth/BluetoothGattService.aidl | 19 ---- .../bluetooth/BluetoothHeadsetClientCall.aidl | 18 --- .../bluetooth/BluetoothHealthAppConfiguration.aidl | 19 ---- .../BluetoothHidDeviceAppConfiguration.aidl | 19 ---- .../BluetoothHidDeviceAppQosSettings.aidl | 19 ---- .../BluetoothHidDeviceAppSdpSettings.aidl | 19 ---- core/java/android/bluetooth/IBluetooth.aidl | 125 --------------------- core/java/android/bluetooth/IBluetoothA2dp.aidl | 48 -------- .../java/android/bluetooth/IBluetoothA2dpSink.aidl | 37 ------ .../bluetooth/IBluetoothAvrcpController.aidl | 36 ------ .../java/android/bluetooth/IBluetoothCallback.aidl | 28 ----- core/java/android/bluetooth/IBluetoothGatt.aidl | 115 ------------------- .../android/bluetooth/IBluetoothGattCallback.aidl | 42 ------- .../bluetooth/IBluetoothGattServerCallback.aidl | 47 -------- core/java/android/bluetooth/IBluetoothHeadset.aidl | 64 ----------- .../android/bluetooth/IBluetoothHeadsetClient.aidl | 64 ----------- .../android/bluetooth/IBluetoothHeadsetPhone.aidl | 39 ------- core/java/android/bluetooth/IBluetoothHealth.aidl | 42 ------- .../bluetooth/IBluetoothHealthCallback.aidl | 32 ------ .../bluetooth/IBluetoothHidDeviceCallback.aidl | 31 ----- .../android/bluetooth/IBluetoothInputDevice.aidl | 67 ----------- .../android/bluetooth/IBluetoothInputHost.aidl | 40 ------- core/java/android/bluetooth/IBluetoothManager.aidl | 53 --------- .../bluetooth/IBluetoothManagerCallback.aidl | 30 ----- core/java/android/bluetooth/IBluetoothMap.aidl | 37 ------ .../android/bluetooth/IBluetoothMapClient.aidl | 40 ------- core/java/android/bluetooth/IBluetoothPan.aidl | 35 ------ core/java/android/bluetooth/IBluetoothPbap.aidl | 32 ------ .../android/bluetooth/IBluetoothPbapClient.aidl | 34 ------ .../IBluetoothProfileServiceConnection.aidl | 30 ----- core/java/android/bluetooth/IBluetoothSap.aidl | 37 ------ .../bluetooth/IBluetoothStateChangeCallback.aidl | 27 ----- core/java/android/bluetooth/OobData.aidl | 19 ---- core/java/android/bluetooth/le/AdvertiseData.aidl | 19 ---- .../android/bluetooth/le/AdvertiseSettings.aidl | 19 ---- .../bluetooth/le/AdvertisingSetParameters.aidl | 19 ---- .../bluetooth/le/IAdvertisingSetCallback.aidl | 33 ------ .../bluetooth/le/IPeriodicAdvertisingCallback.aidl | 31 ----- .../android/bluetooth/le/IScannerCallback.aidl | 31 ----- .../le/PeriodicAdvertisingParameters.aidl | 19 ---- .../bluetooth/le/PeriodicAdvertisingReport.aidl | 19 ---- .../bluetooth/le/ResultStorageDescriptor.aidl | 23 ---- core/java/android/bluetooth/le/ScanFilter.aidl | 19 ---- core/java/android/bluetooth/le/ScanResult.aidl | 19 ---- core/java/android/bluetooth/le/ScanSettings.aidl | 19 ---- 55 files changed, 38 insertions(+), 1822 deletions(-) delete mode 100644 core/java/android/bluetooth/BluetoothActivityEnergyInfo.aidl delete mode 100644 core/java/android/bluetooth/BluetoothAudioConfig.aidl delete mode 100644 core/java/android/bluetooth/BluetoothAvrcpPlayerSettings.aidl delete mode 100644 core/java/android/bluetooth/BluetoothCodecConfig.aidl delete mode 100644 core/java/android/bluetooth/BluetoothCodecStatus.aidl delete mode 100644 core/java/android/bluetooth/BluetoothDevice.aidl delete mode 100644 core/java/android/bluetooth/BluetoothGattCharacteristic.aidl delete mode 100644 core/java/android/bluetooth/BluetoothGattDescriptor.aidl delete mode 100644 core/java/android/bluetooth/BluetoothGattIncludedService.aidl delete mode 100644 core/java/android/bluetooth/BluetoothGattService.aidl delete mode 100644 core/java/android/bluetooth/BluetoothHeadsetClientCall.aidl delete mode 100644 core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl delete mode 100644 core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl delete mode 100644 core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl delete mode 100644 core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.aidl delete mode 100644 core/java/android/bluetooth/IBluetooth.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothA2dp.aidl delete mode 100755 core/java/android/bluetooth/IBluetoothA2dpSink.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothAvrcpController.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothCallback.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothGatt.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothGattCallback.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothGattServerCallback.aidl delete mode 100755 core/java/android/bluetooth/IBluetoothHeadset.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothHeadsetClient.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothHealth.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothHealthCallback.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothInputDevice.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothInputHost.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothManager.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothManagerCallback.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothMap.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothMapClient.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothPan.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothPbap.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothPbapClient.aidl delete mode 100755 core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothSap.aidl delete mode 100644 core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl delete mode 100644 core/java/android/bluetooth/OobData.aidl delete mode 100644 core/java/android/bluetooth/le/AdvertiseData.aidl delete mode 100644 core/java/android/bluetooth/le/AdvertiseSettings.aidl delete mode 100644 core/java/android/bluetooth/le/AdvertisingSetParameters.aidl delete mode 100644 core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl delete mode 100644 core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl delete mode 100644 core/java/android/bluetooth/le/IScannerCallback.aidl delete mode 100644 core/java/android/bluetooth/le/PeriodicAdvertisingParameters.aidl delete mode 100644 core/java/android/bluetooth/le/PeriodicAdvertisingReport.aidl delete mode 100644 core/java/android/bluetooth/le/ResultStorageDescriptor.aidl delete mode 100644 core/java/android/bluetooth/le/ScanFilter.aidl delete mode 100644 core/java/android/bluetooth/le/ScanResult.aidl delete mode 100644 core/java/android/bluetooth/le/ScanSettings.aidl diff --git a/Android.mk b/Android.mk index b2213095f621..0e6642d70a28 100644 --- a/Android.mk +++ b/Android.mk @@ -119,35 +119,35 @@ LOCAL_SRC_FILES += \ core/java/android/app/usage/ICacheQuotaService.aidl \ core/java/android/app/usage/IStorageStatsManager.aidl \ core/java/android/app/usage/IUsageStatsManager.aidl \ - core/java/android/bluetooth/IBluetooth.aidl \ - core/java/android/bluetooth/IBluetoothA2dp.aidl \ - core/java/android/bluetooth/IBluetoothA2dpSink.aidl \ - core/java/android/bluetooth/IBluetoothAvrcpController.aidl \ - core/java/android/bluetooth/IBluetoothCallback.aidl \ - core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl \ - core/java/android/bluetooth/IBluetoothHeadset.aidl \ - core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \ - core/java/android/bluetooth/IBluetoothHealth.aidl \ - core/java/android/bluetooth/IBluetoothHealthCallback.aidl \ - core/java/android/bluetooth/IBluetoothInputDevice.aidl \ - core/java/android/bluetooth/IBluetoothPan.aidl \ - core/java/android/bluetooth/IBluetoothManager.aidl \ - core/java/android/bluetooth/IBluetoothManagerCallback.aidl \ - core/java/android/bluetooth/IBluetoothMap.aidl \ - core/java/android/bluetooth/IBluetoothMapClient.aidl \ - core/java/android/bluetooth/IBluetoothPbap.aidl \ - core/java/android/bluetooth/IBluetoothPbapClient.aidl \ - core/java/android/bluetooth/IBluetoothSap.aidl \ - core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \ - core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \ - core/java/android/bluetooth/IBluetoothInputHost.aidl \ - core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ - core/java/android/bluetooth/IBluetoothGatt.aidl \ - core/java/android/bluetooth/IBluetoothGattCallback.aidl \ - core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \ - core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl \ - core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \ - core/java/android/bluetooth/le/IScannerCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetooth.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothA2dp.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothA2dpSink.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothAvrcpController.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothProfileServiceConnection.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHeadset.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHealth.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHealthCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothInputDevice.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothPan.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothManager.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothManagerCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothMap.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothMapClient.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothPbap.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothPbapClient.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothSap.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothStateChangeCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHeadsetClient.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothInputHost.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothGatt.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothGattCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothGattServerCallback.aidl \ + ../../system/bt/binder/android/bluetooth/le/IAdvertisingSetCallback.aidl \ + ../../system/bt/binder/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \ + ../../system/bt/binder/android/bluetooth/le/IScannerCallback.aidl \ core/java/android/content/IClipboard.aidl \ core/java/android/content/IContentService.aidl \ core/java/android/content/IIntentReceiver.aidl \ @@ -561,7 +561,8 @@ LOCAL_AIDL_INCLUDES += \ frameworks/av/camera/aidl \ frameworks/av/drm/libmediadrm/aidl \ frameworks/native/aidl/gui \ - system/netd/server/binder + system/netd/server/binder \ + system/bt/binder LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/android/R.java \ @@ -828,16 +829,16 @@ aidl_files := \ frameworks/base/core/java/android/nfc/Tag.aidl \ frameworks/base/core/java/android/nfc/NdefRecord.aidl \ frameworks/base/core/java/android/nfc/NdefMessage.aidl \ - frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \ - frameworks/base/core/java/android/bluetooth/le/AdvertiseSettings.aidl \ - frameworks/base/core/java/android/bluetooth/le/ScanSettings.aidl \ - frameworks/base/core/java/android/bluetooth/le/AdvertiseData.aidl \ - frameworks/base/core/java/android/bluetooth/le/ScanFilter.aidl \ - frameworks/base/core/java/android/bluetooth/le/ScanResult.aidl \ - frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \ frameworks/base/core/java/android/database/CursorWindow.aidl \ frameworks/base/core/java/android/service/quicksettings/Tile.aidl \ frameworks/native/aidl/binder/android/os/PersistableBundle.aidl \ + system/bt/binder/android/bluetooth/BluetoothHealthAppConfiguration.aidl \ + system/bt/binder/android/bluetooth/le/AdvertiseSettings.aidl \ + system/bt/binder/android/bluetooth/le/ScanSettings.aidl \ + system/bt/binder/android/bluetooth/le/AdvertiseData.aidl \ + system/bt/binder/android/bluetooth/le/ScanFilter.aidl \ + system/bt/binder/android/bluetooth/le/ScanResult.aidl \ + system/bt/binder/android/bluetooth/BluetoothDevice.aidl \ system/netd/server/binder/android/net/UidRange.aidl \ frameworks/base/telephony/java/android/telephony/PcoData.aidl \ diff --git a/core/java/android/bluetooth/BluetoothActivityEnergyInfo.aidl b/core/java/android/bluetooth/BluetoothActivityEnergyInfo.aidl deleted file mode 100644 index 60cbf9f31337..000000000000 --- a/core/java/android/bluetooth/BluetoothActivityEnergyInfo.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothActivityEnergyInfo; diff --git a/core/java/android/bluetooth/BluetoothAudioConfig.aidl b/core/java/android/bluetooth/BluetoothAudioConfig.aidl deleted file mode 100644 index 63be5cff87da..000000000000 --- a/core/java/android/bluetooth/BluetoothAudioConfig.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothAudioConfig; diff --git a/core/java/android/bluetooth/BluetoothAvrcpPlayerSettings.aidl b/core/java/android/bluetooth/BluetoothAvrcpPlayerSettings.aidl deleted file mode 100644 index 590fd63eda8c..000000000000 --- a/core/java/android/bluetooth/BluetoothAvrcpPlayerSettings.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothAvrcpPlayerSettings; diff --git a/core/java/android/bluetooth/BluetoothCodecConfig.aidl b/core/java/android/bluetooth/BluetoothCodecConfig.aidl deleted file mode 100644 index 553e66e1dac5..000000000000 --- a/core/java/android/bluetooth/BluetoothCodecConfig.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothCodecConfig; diff --git a/core/java/android/bluetooth/BluetoothCodecStatus.aidl b/core/java/android/bluetooth/BluetoothCodecStatus.aidl deleted file mode 100644 index f9c3a3de2f4c..000000000000 --- a/core/java/android/bluetooth/BluetoothCodecStatus.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothCodecStatus; diff --git a/core/java/android/bluetooth/BluetoothDevice.aidl b/core/java/android/bluetooth/BluetoothDevice.aidl deleted file mode 100644 index daae74d52c43..000000000000 --- a/core/java/android/bluetooth/BluetoothDevice.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothDevice; diff --git a/core/java/android/bluetooth/BluetoothGattCharacteristic.aidl b/core/java/android/bluetooth/BluetoothGattCharacteristic.aidl deleted file mode 100644 index bbb8623e2178..000000000000 --- a/core/java/android/bluetooth/BluetoothGattCharacteristic.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothGattCharacteristic; diff --git a/core/java/android/bluetooth/BluetoothGattDescriptor.aidl b/core/java/android/bluetooth/BluetoothGattDescriptor.aidl deleted file mode 100644 index 439327331671..000000000000 --- a/core/java/android/bluetooth/BluetoothGattDescriptor.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothGattDescriptor; diff --git a/core/java/android/bluetooth/BluetoothGattIncludedService.aidl b/core/java/android/bluetooth/BluetoothGattIncludedService.aidl deleted file mode 100644 index 1ef427edc3a0..000000000000 --- a/core/java/android/bluetooth/BluetoothGattIncludedService.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothGattIncludedService; diff --git a/core/java/android/bluetooth/BluetoothGattService.aidl b/core/java/android/bluetooth/BluetoothGattService.aidl deleted file mode 100644 index 84314d2072df..000000000000 --- a/core/java/android/bluetooth/BluetoothGattService.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable BluetoothGattService; diff --git a/core/java/android/bluetooth/BluetoothHeadsetClientCall.aidl b/core/java/android/bluetooth/BluetoothHeadsetClientCall.aidl deleted file mode 100644 index 35f792387ec7..000000000000 --- a/core/java/android/bluetooth/BluetoothHeadsetClientCall.aidl +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.bluetooth; - -parcelable BluetoothHeadsetClientCall; diff --git a/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl b/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl deleted file mode 100644 index bc9e54f5787e..000000000000 --- a/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* -** Copyright 2011, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package android.bluetooth; - -parcelable BluetoothHealthAppConfiguration; diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl b/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl deleted file mode 100644 index 283a71790d3d..000000000000 --- a/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* -** Copyright 2016, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package android.bluetooth; - -parcelable BluetoothHidDeviceAppConfiguration; diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl b/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl deleted file mode 100644 index 14f91140af2b..000000000000 --- a/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* -** Copyright 2016, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package android.bluetooth; - -parcelable BluetoothHidDeviceAppQosSettings; diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.aidl b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.aidl deleted file mode 100644 index 87dd10ee15f4..000000000000 --- a/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* -** Copyright 2016, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package android.bluetooth; - -parcelable BluetoothHidDeviceAppSdpSettings; diff --git a/core/java/android/bluetooth/IBluetooth.aidl b/core/java/android/bluetooth/IBluetooth.aidl deleted file mode 100644 index 1d7cfc900e4c..000000000000 --- a/core/java/android/bluetooth/IBluetooth.aidl +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2008, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.IBluetoothCallback; -import android.bluetooth.IBluetoothStateChangeCallback; -import android.bluetooth.BluetoothActivityEnergyInfo; -import android.bluetooth.BluetoothDevice; -import android.bluetooth.OobData; -import android.os.ParcelUuid; -import android.os.ParcelFileDescriptor; -import android.os.ResultReceiver; - -/** - * System private API for talking with the Bluetooth service. - * - * {@hide} - */ -interface IBluetooth -{ - boolean isEnabled(); - int getState(); - boolean enable(); - boolean enableNoAutoConnect(); - boolean disable(); - - String getAddress(); - ParcelUuid[] getUuids(); - boolean setName(in String name); - String getName(); - - int getScanMode(); - boolean setScanMode(int mode, int duration); - - int getDiscoverableTimeout(); - boolean setDiscoverableTimeout(int timeout); - - boolean startDiscovery(); - boolean cancelDiscovery(); - boolean isDiscovering(); - long getDiscoveryEndMillis(); - - int getAdapterConnectionState(); - int getProfileConnectionState(int profile); - - BluetoothDevice[] getBondedDevices(); - boolean createBond(in BluetoothDevice device, in int transport); - boolean createBondOutOfBand(in BluetoothDevice device, in int transport, in OobData oobData); - boolean cancelBondProcess(in BluetoothDevice device); - boolean removeBond(in BluetoothDevice device); - int getBondState(in BluetoothDevice device); - boolean isBondingInitiatedLocally(in BluetoothDevice device); - long getSupportedProfiles(); - int getConnectionState(in BluetoothDevice device); - - String getRemoteName(in BluetoothDevice device); - int getRemoteType(in BluetoothDevice device); - String getRemoteAlias(in BluetoothDevice device); - boolean setRemoteAlias(in BluetoothDevice device, in String name); - int getRemoteClass(in BluetoothDevice device); - ParcelUuid[] getRemoteUuids(in BluetoothDevice device); - boolean fetchRemoteUuids(in BluetoothDevice device); - boolean sdpSearch(in BluetoothDevice device, in ParcelUuid uuid); - int getBatteryLevel(in BluetoothDevice device); - - boolean setPin(in BluetoothDevice device, boolean accept, int len, in byte[] pinCode); - boolean setPasskey(in BluetoothDevice device, boolean accept, int len, in byte[] - passkey); - boolean setPairingConfirmation(in BluetoothDevice device, boolean accept); - - int getPhonebookAccessPermission(in BluetoothDevice device); - boolean setPhonebookAccessPermission(in BluetoothDevice device, int value); - int getMessageAccessPermission(in BluetoothDevice device); - boolean setMessageAccessPermission(in BluetoothDevice device, int value); - int getSimAccessPermission(in BluetoothDevice device); - boolean setSimAccessPermission(in BluetoothDevice device, int value); - - void sendConnectionStateChange(in BluetoothDevice device, int profile, int state, int prevState); - - void registerCallback(in IBluetoothCallback callback); - void unregisterCallback(in IBluetoothCallback callback); - - // For Socket - ParcelFileDescriptor connectSocket(in BluetoothDevice device, int type, in ParcelUuid uuid, int port, int flag); - ParcelFileDescriptor createSocketChannel(int type, in String serviceName, in ParcelUuid uuid, int port, int flag); - - boolean factoryReset(); - - boolean isMultiAdvertisementSupported(); - boolean isOffloadedFilteringSupported(); - boolean isOffloadedScanBatchingSupported(); - boolean isActivityAndEnergyReportingSupported(); - boolean isLe2MPhySupported(); - boolean isLeCodedPhySupported(); - boolean isLeExtendedAdvertisingSupported(); - boolean isLePeriodicAdvertisingSupported(); - int getLeMaximumAdvertisingDataLength(); - BluetoothActivityEnergyInfo reportActivityInfo(); - - /** - * Requests the controller activity info asynchronously. - * The implementor is expected to reply with the - * {@link android.bluetooth.BluetoothActivityEnergyInfo} object placed into the Bundle with the - * key {@link android.os.BatteryStats#RESULT_RECEIVER_CONTROLLER_KEY}. - * The result code is ignored. - */ - oneway void requestActivityInfo(in ResultReceiver result); - - void onLeServiceUp(); - void onBrEdrDown(); -} diff --git a/core/java/android/bluetooth/IBluetoothA2dp.aidl b/core/java/android/bluetooth/IBluetoothA2dp.aidl deleted file mode 100644 index 1b533cba3d2a..000000000000 --- a/core/java/android/bluetooth/IBluetoothA2dp.aidl +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothCodecConfig; -import android.bluetooth.BluetoothCodecStatus; -import android.bluetooth.BluetoothDevice; - -/** - * APIs for Bluetooth A2DP service - * - * @hide - */ -interface IBluetoothA2dp { - // Public API - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device, int priority); - int getPriority(in BluetoothDevice device); - boolean isAvrcpAbsoluteVolumeSupported(); - oneway void adjustAvrcpAbsoluteVolume(int direction); - oneway void setAvrcpAbsoluteVolume(int volume); - boolean isA2dpPlaying(in BluetoothDevice device); - BluetoothCodecStatus getCodecStatus(); - oneway void setCodecConfigPreference(in BluetoothCodecConfig codecConfig); - oneway void enableOptionalCodecs(); - oneway void disableOptionalCodecs(); - int supportsOptionalCodecs(in BluetoothDevice device); - int getOptionalCodecsEnabled(in BluetoothDevice device); - oneway void setOptionalCodecsEnabled(in BluetoothDevice device, int value); -} diff --git a/core/java/android/bluetooth/IBluetoothA2dpSink.aidl b/core/java/android/bluetooth/IBluetoothA2dpSink.aidl deleted file mode 100755 index d1458246dfe9..000000000000 --- a/core/java/android/bluetooth/IBluetoothA2dpSink.aidl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothAudioConfig; -import android.bluetooth.BluetoothDevice; - -/** - * APIs for Bluetooth A2DP sink service - * - * @hide - */ -interface IBluetoothA2dpSink { - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - BluetoothAudioConfig getAudioConfig(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device, int priority); - int getPriority(in BluetoothDevice device); - boolean isA2dpPlaying(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothAvrcpController.aidl b/core/java/android/bluetooth/IBluetoothAvrcpController.aidl deleted file mode 100644 index cfa11cac4a8a..000000000000 --- a/core/java/android/bluetooth/IBluetoothAvrcpController.aidl +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothAvrcpPlayerSettings; -import android.bluetooth.BluetoothDevice; -import android.media.MediaMetadata; -import android.media.session.PlaybackState; - -/** - * APIs for Bluetooth AVRCP controller service - * - * @hide - */ -interface IBluetoothAvrcpController { - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - BluetoothAvrcpPlayerSettings getPlayerSettings(in BluetoothDevice device); - boolean setPlayerApplicationSetting(in BluetoothAvrcpPlayerSettings plAppSetting); - void sendGroupNavigationCmd(in BluetoothDevice device, int keyCode, int keyState); -} diff --git a/core/java/android/bluetooth/IBluetoothCallback.aidl b/core/java/android/bluetooth/IBluetoothCallback.aidl deleted file mode 100644 index e2809788d67a..000000000000 --- a/core/java/android/bluetooth/IBluetoothCallback.aidl +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -/** - * System private API for Bluetooth service callbacks. - * - * {@hide} - */ -interface IBluetoothCallback -{ - //void onRfcommChannelFound(int channel); - void onBluetoothStateChange(int prevState, int newState); -} diff --git a/core/java/android/bluetooth/IBluetoothGatt.aidl b/core/java/android/bluetooth/IBluetoothGatt.aidl deleted file mode 100644 index e87f07007223..000000000000 --- a/core/java/android/bluetooth/IBluetoothGatt.aidl +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.app.PendingIntent; -import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothGattService; -import android.bluetooth.le.AdvertiseSettings; -import android.bluetooth.le.AdvertiseData; -import android.bluetooth.le.AdvertisingSetParameters; -import android.bluetooth.le.PeriodicAdvertisingParameters; -import android.bluetooth.le.ScanFilter; -import android.bluetooth.le.ScanResult; -import android.bluetooth.le.ScanSettings; -import android.bluetooth.le.ResultStorageDescriptor; -import android.os.ParcelUuid; -import android.os.WorkSource; - -import android.bluetooth.IBluetoothGattCallback; -import android.bluetooth.IBluetoothGattServerCallback; -import android.bluetooth.le.IAdvertisingSetCallback; -import android.bluetooth.le.IPeriodicAdvertisingCallback; -import android.bluetooth.le.IScannerCallback; - -/** - * API for interacting with BLE / GATT - * @hide - */ -interface IBluetoothGatt { - List getDevicesMatchingConnectionStates(in int[] states); - - void registerScanner(in IScannerCallback callback, in WorkSource workSource); - void unregisterScanner(in int scannerId); - void startScan(in int scannerId, in ScanSettings settings, in List filters, - in List scanStorages, in String callingPackage); - void startScanForIntent(in PendingIntent intent, in ScanSettings settings, in List filters, - in String callingPackage); - void stopScanForIntent(in PendingIntent intent, in String callingPackage); - void stopScan(in int scannerId); - void flushPendingBatchResults(in int scannerId); - - void startAdvertisingSet(in AdvertisingSetParameters parameters, in AdvertiseData advertiseData, - in AdvertiseData scanResponse, in PeriodicAdvertisingParameters periodicParameters, - in AdvertiseData periodicData, in int duration, in int maxExtAdvEvents, - in IAdvertisingSetCallback callback); - void stopAdvertisingSet(in IAdvertisingSetCallback callback); - - void getOwnAddress(in int advertiserId); - void enableAdvertisingSet(in int advertiserId, in boolean enable, in int duration, in int maxExtAdvEvents); - void setAdvertisingData(in int advertiserId, in AdvertiseData data); - void setScanResponseData(in int advertiserId, in AdvertiseData data); - void setAdvertisingParameters(in int advertiserId, in AdvertisingSetParameters parameters); - void setPeriodicAdvertisingParameters(in int advertiserId, in PeriodicAdvertisingParameters parameters); - void setPeriodicAdvertisingData(in int advertiserId, in AdvertiseData data); - void setPeriodicAdvertisingEnable(in int advertiserId, in boolean enable); - - void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback); - void unregisterSync(in IPeriodicAdvertisingCallback callback); - - void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback); - - void unregisterClient(in int clientIf); - void clientConnect(in int clientIf, in String address, in boolean isDirect, in int transport, in boolean opportunistic, in int phy); - void clientDisconnect(in int clientIf, in String address); - void clientSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions); - void clientReadPhy(in int clientIf, in String address); - void refreshDevice(in int clientIf, in String address); - void discoverServices(in int clientIf, in String address); - void discoverServiceByUuid(in int clientIf, in String address, in ParcelUuid uuid); - void readCharacteristic(in int clientIf, in String address, in int handle, in int authReq); - void readUsingCharacteristicUuid(in int clientIf, in String address, in ParcelUuid uuid, - in int startHandle, in int endHandle, in int authReq); - void writeCharacteristic(in int clientIf, in String address, in int handle, - in int writeType, in int authReq, in byte[] value); - void readDescriptor(in int clientIf, in String address, in int handle, in int authReq); - void writeDescriptor(in int clientIf, in String address, in int handle, - in int authReq, in byte[] value); - void registerForNotification(in int clientIf, in String address, in int handle, in boolean enable); - void beginReliableWrite(in int clientIf, in String address); - void endReliableWrite(in int clientIf, in String address, in boolean execute); - void readRemoteRssi(in int clientIf, in String address); - void configureMTU(in int clientIf, in String address, in int mtu); - void connectionParameterUpdate(in int clientIf, in String address, in int connectionPriority); - - void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback); - void unregisterServer(in int serverIf); - void serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport); - void serverDisconnect(in int serverIf, in String address); - void serverSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions); - void serverReadPhy(in int clientIf, in String address); - void addService(in int serverIf, in BluetoothGattService service); - void removeService(in int serverIf, in int handle); - void clearServices(in int serverIf); - void sendResponse(in int serverIf, in String address, in int requestId, - in int status, in int offset, in byte[] value); - void sendNotification(in int serverIf, in String address, in int handle, - in boolean confirm, in byte[] value); - void disconnectAll(); - void unregAll(); - int numHwTrackFiltersAvailable(); -} diff --git a/core/java/android/bluetooth/IBluetoothGattCallback.aidl b/core/java/android/bluetooth/IBluetoothGattCallback.aidl deleted file mode 100644 index 4f85cdda87f7..000000000000 --- a/core/java/android/bluetooth/IBluetoothGattCallback.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.bluetooth; - -import android.os.ParcelUuid; -import android.bluetooth.BluetoothGattService; - -/** - * Callback definitions for interacting with BLE / GATT - * @hide - */ -oneway interface IBluetoothGattCallback { - void onClientRegistered(in int status, in int clientIf); - void onClientConnectionState(in int status, in int clientIf, - in boolean connected, in String address); - void onPhyUpdate(in String address, in int txPhy, in int rxPhy, in int status); - void onPhyRead(in String address, in int txPhy, in int rxPhy, in int status); - void onSearchComplete(in String address, in List services, in int status); - void onCharacteristicRead(in String address, in int status, in int handle, in byte[] value); - void onCharacteristicWrite(in String address, in int status, in int handle); - void onExecuteWrite(in String address, in int status); - void onDescriptorRead(in String address, in int status, in int handle, in byte[] value); - void onDescriptorWrite(in String address, in int status, in int handle); - void onNotify(in String address, in int handle, in byte[] value); - void onReadRemoteRssi(in String address, in int rssi, in int status); - void onConfigureMTU(in String address, in int mtu, in int status); - void onConnectionUpdated(in String address, in int interval, in int latency, - in int timeout, in int status); -} diff --git a/core/java/android/bluetooth/IBluetoothGattServerCallback.aidl b/core/java/android/bluetooth/IBluetoothGattServerCallback.aidl deleted file mode 100644 index 74ee11fbd321..000000000000 --- a/core/java/android/bluetooth/IBluetoothGattServerCallback.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.bluetooth; - -import android.bluetooth.BluetoothGattService; - -/** - * Callback definitions for interacting with BLE / GATT - * @hide - */ -oneway interface IBluetoothGattServerCallback { - void onServerRegistered(in int status, in int serverIf); - void onServerConnectionState(in int status, in int serverIf, - in boolean connected, in String address); - void onServiceAdded(in int status, in BluetoothGattService service); - void onCharacteristicReadRequest(in String address, in int transId, in int offset, - in boolean isLong, in int handle); - void onDescriptorReadRequest(in String address, in int transId, - in int offset, in boolean isLong, - in int handle); - void onCharacteristicWriteRequest(in String address, in int transId, in int offset, - in int length, in boolean isPrep, in boolean needRsp, - in int handle, in byte[] value); - void onDescriptorWriteRequest(in String address, in int transId, in int offset, - in int length, in boolean isPrep, in boolean needRsp, - in int handle, in byte[] value); - void onExecuteWrite(in String address, in int transId, in boolean execWrite); - void onNotificationSent(in String address, in int status); - void onMtuChanged(in String address, in int mtu); - void onPhyUpdate(in String address, in int txPhy, in int rxPhy, in int status); - void onPhyRead(in String address, in int txPhy, in int rxPhy, in int status); - void onConnectionUpdated(in String address, in int interval, in int latency, - in int timeout, in int status); -} diff --git a/core/java/android/bluetooth/IBluetoothHeadset.aidl b/core/java/android/bluetooth/IBluetoothHeadset.aidl deleted file mode 100755 index 92ab8da7542b..000000000000 --- a/core/java/android/bluetooth/IBluetoothHeadset.aidl +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; - -/** - * API for Bluetooth Headset service - * - * {@hide} - */ -interface IBluetoothHeadset { - // Public API - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device, int priority); - int getPriority(in BluetoothDevice device); - boolean startVoiceRecognition(in BluetoothDevice device); - boolean stopVoiceRecognition(in BluetoothDevice device); - boolean isAudioConnected(in BluetoothDevice device); - boolean sendVendorSpecificResultCode(in BluetoothDevice device, - in String command, - in String arg); - - // APIs that can be made public in future - int getBatteryUsageHint(in BluetoothDevice device); - - // Internal functions, not be made public - boolean acceptIncomingConnect(in BluetoothDevice device); - boolean rejectIncomingConnect(in BluetoothDevice device); - int getAudioState(in BluetoothDevice device); - - boolean isAudioOn(); - boolean connectAudio(); - boolean disconnectAudio(); - void setAudioRouteAllowed(boolean allowed); - boolean getAudioRouteAllowed(); - void setForceScoAudio(boolean forced); - boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device); - boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device); - oneway void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type); - void clccResponse(int index, int direction, int status, int mode, boolean mpty, - String number, int type); - boolean enableWBS(); - boolean disableWBS(); - void bindResponse(int ind_id, boolean ind_status); -} diff --git a/core/java/android/bluetooth/IBluetoothHeadsetClient.aidl b/core/java/android/bluetooth/IBluetoothHeadsetClient.aidl deleted file mode 100644 index e571b009f044..000000000000 --- a/core/java/android/bluetooth/IBluetoothHeadsetClient.aidl +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothHeadsetClientCall; -import android.os.Bundle; - -/** - * API for Bluetooth Headset Client service (HFP HF Role) - * - * {@hide} - */ -interface IBluetoothHeadsetClient { - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device, int priority); - int getPriority(in BluetoothDevice device); - - boolean startVoiceRecognition(in BluetoothDevice device); - boolean stopVoiceRecognition(in BluetoothDevice device); - - List getCurrentCalls(in BluetoothDevice device); - Bundle getCurrentAgEvents(in BluetoothDevice device); - - boolean acceptCall(in BluetoothDevice device, int flag); - boolean holdCall(in BluetoothDevice device); - boolean rejectCall(in BluetoothDevice device); - boolean terminateCall(in BluetoothDevice device, in BluetoothHeadsetClientCall call); - - boolean enterPrivateMode(in BluetoothDevice device, int index); - boolean explicitCallTransfer(in BluetoothDevice device); - - BluetoothHeadsetClientCall dial(in BluetoothDevice device, String number); - - boolean sendDTMF(in BluetoothDevice device, byte code); - boolean getLastVoiceTagNumber(in BluetoothDevice device); - - int getAudioState(in BluetoothDevice device); - boolean connectAudio(in BluetoothDevice device); - boolean disconnectAudio(in BluetoothDevice device); - void setAudioRouteAllowed(in BluetoothDevice device, boolean allowed); - boolean getAudioRouteAllowed(in BluetoothDevice device); - - Bundle getCurrentAgFeatures(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl b/core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl deleted file mode 100644 index d5e64f6faecc..000000000000 --- a/core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -/** - * API for Bluetooth Headset Phone Service in phone app - * - * {@hide} - */ -interface IBluetoothHeadsetPhone { - // Internal functions, not be made public - boolean answerCall(); - boolean hangupCall(); - boolean sendDtmf(int dtmf); - boolean processChld(int chld); - String getNetworkOperator(); - String getSubscriberNumber(); - boolean listCurrentCalls(); - boolean queryPhoneState(); - - // Internal for phone app to call - void updateBtHandsfreeAfterRadioTechnologyChange(); - void cdmaSwapSecondCallState(); - void cdmaSetSecondCallState(boolean state); -} diff --git a/core/java/android/bluetooth/IBluetoothHealth.aidl b/core/java/android/bluetooth/IBluetoothHealth.aidl deleted file mode 100644 index a84a42cb9ce3..000000000000 --- a/core/java/android/bluetooth/IBluetoothHealth.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothHealthAppConfiguration; -import android.bluetooth.IBluetoothHealthCallback; -import android.os.ParcelFileDescriptor; - -/** - * API for Bluetooth Health service - * - * {@hide} - */ -interface IBluetoothHealth -{ - boolean registerAppConfiguration(in BluetoothHealthAppConfiguration config, - in IBluetoothHealthCallback callback); - boolean unregisterAppConfiguration(in BluetoothHealthAppConfiguration config); - boolean connectChannelToSource(in BluetoothDevice device, in BluetoothHealthAppConfiguration config); - boolean connectChannelToSink(in BluetoothDevice device, in BluetoothHealthAppConfiguration config, - int channelType); - boolean disconnectChannel(in BluetoothDevice device, in BluetoothHealthAppConfiguration config, int id); - ParcelFileDescriptor getMainChannelFd(in BluetoothDevice device, in BluetoothHealthAppConfiguration config); - List getConnectedHealthDevices(); - List getHealthDevicesMatchingConnectionStates(in int[] states); - int getHealthDeviceConnectionState(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothHealthCallback.aidl b/core/java/android/bluetooth/IBluetoothHealthCallback.aidl deleted file mode 100644 index 0ace9fe1230a..000000000000 --- a/core/java/android/bluetooth/IBluetoothHealthCallback.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2011, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothHealthAppConfiguration; -import android.os.ParcelFileDescriptor; - -/** - *@hide - */ -interface IBluetoothHealthCallback -{ - void onHealthAppConfigurationStatusChange(in BluetoothHealthAppConfiguration config, int status); - void onHealthChannelStateChange(in BluetoothHealthAppConfiguration config, - in BluetoothDevice device, int prevState, int newState, in - ParcelFileDescriptor fd, int id); -} diff --git a/core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl b/core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl deleted file mode 100644 index a737198ad954..000000000000 --- a/core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2016, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothHidDeviceAppConfiguration; - -/** @hide */ -interface IBluetoothHidDeviceCallback { - void onAppStatusChanged(in BluetoothDevice device, in BluetoothHidDeviceAppConfiguration config, boolean registered); - void onConnectionStateChanged(in BluetoothDevice device, in int state); - void onGetReport(in BluetoothDevice device, in byte type, in byte id, in int bufferSize); - void onSetReport(in BluetoothDevice device, in byte type, in byte id, in byte[] data); - void onSetProtocol(in BluetoothDevice device, in byte protocol); - void onIntrData(in BluetoothDevice device, in byte reportId, in byte[] data); - void onVirtualCableUnplug(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothInputDevice.aidl b/core/java/android/bluetooth/IBluetoothInputDevice.aidl deleted file mode 100644 index 5bd3f7819323..000000000000 --- a/core/java/android/bluetooth/IBluetoothInputDevice.aidl +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; - -/** - * API for Bluetooth HID service - * - * {@hide} - */ -interface IBluetoothInputDevice { - // Public API - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device, int priority); - int getPriority(in BluetoothDevice device); - /** - * @hide - */ - boolean getProtocolMode(in BluetoothDevice device); - /** - * @hide - */ - boolean virtualUnplug(in BluetoothDevice device); - /** - * @hide - */ - boolean setProtocolMode(in BluetoothDevice device, int protocolMode); - /** - * @hide - */ - boolean getReport(in BluetoothDevice device, byte reportType, byte reportId, int bufferSize); - /** - * @hide - */ - boolean setReport(in BluetoothDevice device, byte reportType, String report); - /** - * @hide - */ - boolean sendData(in BluetoothDevice device, String report); - /** - * @hide - */ - boolean getIdleTime(in BluetoothDevice device); - /** - * @hide - */ - boolean setIdleTime(in BluetoothDevice device, byte idleTime); -} diff --git a/core/java/android/bluetooth/IBluetoothInputHost.aidl b/core/java/android/bluetooth/IBluetoothInputHost.aidl deleted file mode 100644 index 6c4993f750e6..000000000000 --- a/core/java/android/bluetooth/IBluetoothInputHost.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothHidDeviceAppConfiguration; -import android.bluetooth.IBluetoothHidDeviceCallback; -import android.bluetooth.BluetoothHidDeviceAppSdpSettings; -import android.bluetooth.BluetoothHidDeviceAppQosSettings; - -/** @hide */ -interface IBluetoothInputHost { - boolean registerApp(in BluetoothHidDeviceAppConfiguration config, - in BluetoothHidDeviceAppSdpSettings sdp, in BluetoothHidDeviceAppQosSettings inQos, - in BluetoothHidDeviceAppQosSettings outQos, in IBluetoothHidDeviceCallback callback); - boolean unregisterApp(in BluetoothHidDeviceAppConfiguration config); - boolean sendReport(in BluetoothDevice device, in int id, in byte[] data); - boolean replyReport(in BluetoothDevice device, in byte type, in byte id, in byte[] data); - boolean reportError(in BluetoothDevice device, byte error); - boolean unplug(in BluetoothDevice device); - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothManager.aidl b/core/java/android/bluetooth/IBluetoothManager.aidl deleted file mode 100644 index 2d5fc98e5e51..000000000000 --- a/core/java/android/bluetooth/IBluetoothManager.aidl +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.IBluetooth; -import android.bluetooth.IBluetoothGatt; -import android.bluetooth.IBluetoothManagerCallback; -import android.bluetooth.IBluetoothProfileServiceConnection; -import android.bluetooth.IBluetoothStateChangeCallback; - -/** - * System private API for talking with the Bluetooth service. - * - * {@hide} - */ -interface IBluetoothManager -{ - IBluetooth registerAdapter(in IBluetoothManagerCallback callback); - void unregisterAdapter(in IBluetoothManagerCallback callback); - void registerStateChangeCallback(in IBluetoothStateChangeCallback callback); - void unregisterStateChangeCallback(in IBluetoothStateChangeCallback callback); - boolean isEnabled(); - boolean enable(String packageName); - boolean enableNoAutoConnect(String packageName); - boolean disable(String packageName, boolean persist); - int getState(); - IBluetoothGatt getBluetoothGatt(); - - boolean bindBluetoothProfileService(int profile, IBluetoothProfileServiceConnection proxy); - void unbindBluetoothProfileService(int profile, IBluetoothProfileServiceConnection proxy); - - String getAddress(); - String getName(); - - boolean isBleScanAlwaysAvailable(); - int updateBleAppCount(IBinder b, boolean enable, String packageName); - boolean isBleAppPresent(); -} - diff --git a/core/java/android/bluetooth/IBluetoothManagerCallback.aidl b/core/java/android/bluetooth/IBluetoothManagerCallback.aidl deleted file mode 100644 index 8104d2199482..000000000000 --- a/core/java/android/bluetooth/IBluetoothManagerCallback.aidl +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.IBluetooth; - -/** - * API for Communication between BluetoothAdapter and BluetoothManager - * - * {@hide} - */ -oneway interface IBluetoothManagerCallback { - void onBluetoothServiceUp(in IBluetooth bluetoothService); - void onBluetoothServiceDown(); - void onBrEdrDown(); -} diff --git a/core/java/android/bluetooth/IBluetoothMap.aidl b/core/java/android/bluetooth/IBluetoothMap.aidl deleted file mode 100644 index d4af63d1fd24..000000000000 --- a/core/java/android/bluetooth/IBluetoothMap.aidl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; - -/** - * System private API for Bluetooth MAP service - * - * {@hide} - */ -interface IBluetoothMap { - int getState(); - BluetoothDevice getClient(); - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - boolean isConnected(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device, int priority); - int getPriority(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothMapClient.aidl b/core/java/android/bluetooth/IBluetoothMapClient.aidl deleted file mode 100644 index df45af91c92c..000000000000 --- a/core/java/android/bluetooth/IBluetoothMapClient.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.app.PendingIntent; -import android.bluetooth.BluetoothDevice; -import android.net.Uri; - -/** - * System private API for Bluetooth MAP MCE service - * - * {@hide} - */ -interface IBluetoothMapClient { - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - boolean isConnected(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device,in int priority); - int getPriority(in BluetoothDevice device); - boolean sendMessage(in BluetoothDevice device, in Uri[] contacts, in String message, - in PendingIntent sentIntent, in PendingIntent deliveryIntent); - boolean getUnreadMessages(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothPan.aidl b/core/java/android/bluetooth/IBluetoothPan.aidl deleted file mode 100644 index 5a323477704f..000000000000 --- a/core/java/android/bluetooth/IBluetoothPan.aidl +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; - -/** - * API for Bluetooth Pan service - * - * {@hide} - */ -interface IBluetoothPan { - // Public API - boolean isTetheringOn(); - void setBluetoothTethering(boolean value); - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothPbap.aidl b/core/java/android/bluetooth/IBluetoothPbap.aidl deleted file mode 100644 index 7cc77d110e96..000000000000 --- a/core/java/android/bluetooth/IBluetoothPbap.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; - -/** - * System private API for Bluetooth pbap service - * - * {@hide} - */ -interface IBluetoothPbap { - int getState(); - BluetoothDevice getClient(); - boolean connect(in BluetoothDevice device); - void disconnect(); - boolean isConnected(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothPbapClient.aidl b/core/java/android/bluetooth/IBluetoothPbapClient.aidl deleted file mode 100644 index 6d4c5a6f90b6..000000000000 --- a/core/java/android/bluetooth/IBluetoothPbapClient.aidl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; - -/** - * API for Bluetooth Phone Book Access Provile Client Side - * - * {@hide} - */ -interface IBluetoothPbapClient { - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device, int priority); - int getPriority(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl b/core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl deleted file mode 100755 index 541583ff5535..000000000000 --- a/core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.content.ComponentName; -import android.os.IBinder; - -/** - * Callback for bluetooth profile connections. - * - * {@hide} - */ -oneway interface IBluetoothProfileServiceConnection { - void onServiceConnected(in ComponentName comp, in IBinder service); - void onServiceDisconnected(in ComponentName comp); -} diff --git a/core/java/android/bluetooth/IBluetoothSap.aidl b/core/java/android/bluetooth/IBluetoothSap.aidl deleted file mode 100644 index 8970639467c0..000000000000 --- a/core/java/android/bluetooth/IBluetoothSap.aidl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -import android.bluetooth.BluetoothDevice; - -/** - * System private API for Bluetooth SAP service - * - * {@hide} - */ -interface IBluetoothSap { - int getState(); - BluetoothDevice getClient(); - boolean connect(in BluetoothDevice device); - boolean disconnect(in BluetoothDevice device); - boolean isConnected(in BluetoothDevice device); - List getConnectedDevices(); - List getDevicesMatchingConnectionStates(in int[] states); - int getConnectionState(in BluetoothDevice device); - boolean setPriority(in BluetoothDevice device, int priority); - int getPriority(in BluetoothDevice device); -} diff --git a/core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl b/core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl deleted file mode 100644 index 0da4e8843282..000000000000 --- a/core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2011, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -/** - * System private API for Bluetooth state change callback. - * - * {@hide} - */ -oneway interface IBluetoothStateChangeCallback -{ - void onBluetoothStateChange(boolean on); -} diff --git a/core/java/android/bluetooth/OobData.aidl b/core/java/android/bluetooth/OobData.aidl deleted file mode 100644 index d831c647769b..000000000000 --- a/core/java/android/bluetooth/OobData.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth; - -parcelable OobData; diff --git a/core/java/android/bluetooth/le/AdvertiseData.aidl b/core/java/android/bluetooth/le/AdvertiseData.aidl deleted file mode 100644 index bcbf2243e18d..000000000000 --- a/core/java/android/bluetooth/le/AdvertiseData.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -parcelable AdvertiseData; diff --git a/core/java/android/bluetooth/le/AdvertiseSettings.aidl b/core/java/android/bluetooth/le/AdvertiseSettings.aidl deleted file mode 100644 index 9f47d74ca53c..000000000000 --- a/core/java/android/bluetooth/le/AdvertiseSettings.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -parcelable AdvertiseSettings; \ No newline at end of file diff --git a/core/java/android/bluetooth/le/AdvertisingSetParameters.aidl b/core/java/android/bluetooth/le/AdvertisingSetParameters.aidl deleted file mode 100644 index 39034a001faa..000000000000 --- a/core/java/android/bluetooth/le/AdvertisingSetParameters.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -parcelable AdvertisingSetParameters; diff --git a/core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl b/core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl deleted file mode 100644 index 3628c775b798..000000000000 --- a/core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.bluetooth.le; - -/** - * Callback definitions for interacting with Advertiser - * @hide - */ -oneway interface IAdvertisingSetCallback { - void onAdvertisingSetStarted(in int advertiserId, in int tx_power, in int status); - void onOwnAddressRead(in int advertiserId, in int addressType, in String address); - void onAdvertisingSetStopped(in int advertiserId); - void onAdvertisingEnabled(in int advertiserId, in boolean enable, in int status); - void onAdvertisingDataSet(in int advertiserId, in int status); - void onScanResponseDataSet(in int advertiserId, in int status); - void onAdvertisingParametersUpdated(in int advertiserId, in int tx_power, in int status); - void onPeriodicAdvertisingParametersUpdated(in int advertiserId, in int status); - void onPeriodicAdvertisingDataSet(in int advertiserId, in int status); - void onPeriodicAdvertisingEnabled(in int advertiserId, in boolean enable, in int status); -} diff --git a/core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl b/core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl deleted file mode 100644 index a76c54d4ab49..000000000000 --- a/core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.bluetooth.le; - -import android.bluetooth.BluetoothDevice; -import android.bluetooth.le.PeriodicAdvertisingReport; - -/** - * Callback definitions for interacting with Periodic Advertising - * @hide - */ -oneway interface IPeriodicAdvertisingCallback { - - void onSyncEstablished(in int syncHandle, in BluetoothDevice device, in int advertisingSid, - in int skip, in int timeout, in int status); - void onPeriodicAdvertisingReport(in PeriodicAdvertisingReport report); - void onSyncLost(in int syncHandle); -} diff --git a/core/java/android/bluetooth/le/IScannerCallback.aidl b/core/java/android/bluetooth/le/IScannerCallback.aidl deleted file mode 100644 index 8cbbaef41ae1..000000000000 --- a/core/java/android/bluetooth/le/IScannerCallback.aidl +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.bluetooth.le; - -import android.bluetooth.le.ScanResult; - -/** - * Callback definitions for interacting with Advertiser - * @hide - */ -oneway interface IScannerCallback { - void onScannerRegistered(in int status, in int scannerId); - - void onScanResult(in ScanResult scanResult); - void onBatchScanResults(in List batchResults); - void onFoundOrLost(in boolean onFound, in ScanResult scanResult); - void onScanManagerErrorCallback(in int errorCode); -} diff --git a/core/java/android/bluetooth/le/PeriodicAdvertisingParameters.aidl b/core/java/android/bluetooth/le/PeriodicAdvertisingParameters.aidl deleted file mode 100644 index f4bea22a12f2..000000000000 --- a/core/java/android/bluetooth/le/PeriodicAdvertisingParameters.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -parcelable PeriodicAdvertisingParameters; diff --git a/core/java/android/bluetooth/le/PeriodicAdvertisingReport.aidl b/core/java/android/bluetooth/le/PeriodicAdvertisingReport.aidl deleted file mode 100644 index 547d09611fdb..000000000000 --- a/core/java/android/bluetooth/le/PeriodicAdvertisingReport.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -parcelable PeriodicAdvertisingReport; diff --git a/core/java/android/bluetooth/le/ResultStorageDescriptor.aidl b/core/java/android/bluetooth/le/ResultStorageDescriptor.aidl deleted file mode 100644 index f218a01a5d1c..000000000000 --- a/core/java/android/bluetooth/le/ResultStorageDescriptor.aidl +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -/** - * {@hide} - */ - -parcelable ResultStorageDescriptor; diff --git a/core/java/android/bluetooth/le/ScanFilter.aidl b/core/java/android/bluetooth/le/ScanFilter.aidl deleted file mode 100644 index 4cecfe62e11c..000000000000 --- a/core/java/android/bluetooth/le/ScanFilter.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -parcelable ScanFilter; diff --git a/core/java/android/bluetooth/le/ScanResult.aidl b/core/java/android/bluetooth/le/ScanResult.aidl deleted file mode 100644 index 39430350dac9..000000000000 --- a/core/java/android/bluetooth/le/ScanResult.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -parcelable ScanResult; \ No newline at end of file diff --git a/core/java/android/bluetooth/le/ScanSettings.aidl b/core/java/android/bluetooth/le/ScanSettings.aidl deleted file mode 100644 index eb169c1209f3..000000000000 --- a/core/java/android/bluetooth/le/ScanSettings.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.bluetooth.le; - -parcelable ScanSettings; -- 2.11.0