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

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

Merge changes Iacb9f41d,I05aa19dc,I2e00c0aa am: 40e9adb0 

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



Change-Id: I88f90e76683be69c74bf54aaacad694f388b9faf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bd73318 40e9adb0

framework/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ java_defaults { 
    srcs: [

        ":framework-bluetooth-sources",

        ":libbluetooth-binder-aidl",

        ":service-bluetooth-binder-aidl",

    ],

}

service/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -33,7 +33,12 @@ java_defaults { 
    name: "service-bluetooth-common-defaults",

    defaults: ["bluetooth-module-sdk-version-defaults"],

    errorprone: {

        javacflags: ["-Xep:CheckReturnValue:ERROR"],

        javacflags: [

            "-Xep:CheckReturnValue:ERROR",

            "-Xep:ClassCanBeStatic:ERROR",

            "-Xep:EqualsIncompatibleType:ERROR",

            "-Xep:ReferenceEquality:ERROR",

        ],

    },

    product_variables: {

        pdk: {

service/binder/Android.bp

0 → 100644
+20 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "system_bt_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_bt_license"],

}



// AIDL interface used in service-bluetooth

filegroup {

    name: "service-bluetooth-binder-aidl",

    visibility: [

        "//packages/modules/Bluetooth:__subpackages__",

    ],

    srcs: [

        "android/bluetooth/IBluetoothManager.aidl",

        "android/bluetooth/IBluetoothManagerCallback.aidl",

    ],

}