Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2747dd8 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bluetooth_remove_syncrhonousResultReceiver" into... 

Merge changes from topic "bluetooth_remove_syncrhonousResultReceiver" into main am: 1445664f am: ae68deb3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3012400



Change-Id: I59de7bb4889c0005cc2e317aa451b1c623acc1a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3852b9a4 ae68deb3

android/app/aidl/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ filegroup { 
    name: "Bluetooth-binder-aidl",

    srcs: [

        ":framework-bluetooth-updatable-exported-aidl-sources",

        ":modules-utils-synchronous-result-receiver-aidl",

        "android/bluetooth/IBluetooth.aidl",

        "android/bluetooth/IBluetoothA2dp.aidl",

        "android/bluetooth/IBluetoothA2dpSink.aidl",

android/app/aidl/android/bluetooth/BluetoothCodecType.aidl

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 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 BluetoothCodecType;

android/app/aidl/android/bluetooth/BluetoothHearingAid.aidl

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 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 BluetoothHearingAid.AdvertisementServiceData;