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

Commit 70e6cda7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12687986 from 9446a76e to 25Q1-release 

Change-Id: I0462ab200e70b258d76c5857f2719eefd940fef9
parents 152fc4bf 9446a76e

Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -189,10 +189,9 @@ java_defaults { 
java_defaults {

    name: "bluetooth_framework_errorprone_rules",

    defaults: ["bluetooth_errorprone_rules"],

    plugins: [

        "error_prone_android_framework",

    ],

    errorprone: {

        extra_check_modules: ["error_prone_android_framework"],



        javacflags: [

            "-Xep:AndroidFrameworkBinderIdentity:ERROR",

            "-Xep:AndroidFrameworkBluetoothPermission:ERROR",

android/app/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ android_app { 
        "BluetoothApiShims",

        "android.hardware.radio-V1.0-java",

        "android.hardware.radio.sap-V1-java",

        "android.media.audio-aconfig-exported-java",

        "android.os.flags-aconfig-java-export",

        "androidx.annotation_annotation",

        "androidx.core_core",
@@ -284,7 +285,6 @@ android_app { 


    plugins: [

        "androidx.room_room-compiler-plugin",

        "error_prone_android_framework",

    ],



    // Export schemas to the test directory so that we have an history

android/app/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ 
        </activity>



        <service android:process="@string/process"

             android:name="com.android.bluetooth.pbapclient.AuthenticationService"

             android:name="com.android.bluetooth.pbapclient.PbapClientAccountAuthenticatorService"

             android:enabled="false"

             android:exported="true">

            <intent-filter>

android/app/aidl/android/bluetooth/IBluetoothGatt.aidl

+2 −0
Original line number Diff line number Diff line
@@ -192,4 +192,6 @@ interface IBluetoothGatt { 
    int getChannelSoundingMaxSupportedSecurityLevel(in BluetoothDevice remoteDevice, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    int getLocalChannelSoundingMaxSupportedSecurityLevel(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    int[] getChannelSoundingSupportedSecurityLevels(in AttributionSource attributionSource);

}

android/app/aidl/android/bluetooth/IBluetoothLeAudio.aidl

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ interface IBluetoothLeAudio { 
    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void setCodecConfigPreference(in int groupId, in BluetoothLeAudioCodecConfig inputCodecConfig, in BluetoothLeAudioCodecConfig outputCodecConfig, in AttributionSource source);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void setBroadcastToUnicastFallbackGroup(in int groupId, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    int getBroadcastToUnicastFallbackGroup(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    oneway void registerCallback(in IBluetoothLeAudioCallback callback, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    oneway void unregisterCallback(in IBluetoothLeAudioCallback callback, in AttributionSource attributionSource);