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

Commit 1c3c60fa authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I32bf8e45,Ie3027a4e into main 

* changes:
  framework: Fix errorprone warnings
  BluetoothAvrcpController: Fix getPlayerSettings return
parents 15e3f645 5a02bb44

framework/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -88,6 +88,13 @@ java_sdk_library { 
        // Created by jarjar rules.

        "com.android.bluetooth.x",

    ],

    errorprone: {

        javacflags: [

            "-Xep:InlineMeSuggester:OFF", // The @InlineMe annotation is not available

            "-XepExcludedPaths:.*/srcjars/.*", // Exclude generated files

        ],

        enabled: true,

    },

    lint: {

        strict_updatability_linting: true,

    },

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ package android.bluetooth { 
    method public void onPreferredAudioProfilesChanged(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.os.Bundle, int);

  }



  public class BluetoothAssignedNumbers.OrganizationId {

  public static class BluetoothAssignedNumbers.OrganizationId {

    field public static final int BLUETOOTH_SIG = 1; // 0x1

    field public static final int WIFI_ALLIANCE_NEIGHBOR_AWARENESS_NETWORKING = 2; // 0x2

    field public static final int WIFI_ALLIANCE_SERVICE_ADVERTISEMENT = 3; // 0x3

framework/java/android/bluetooth/Attributable.java

+2 −0
Original line number Diff line number Diff line
@@ -31,9 +31,11 @@ import java.util.List; 
 */

public interface Attributable {

    /** @hide */

    @SuppressWarnings("AmbiguousMethodReference")

    void setAttributionSource(@NonNull AttributionSource attributionSource);



    /** @hide */

    @SuppressWarnings("AmbiguousMethodReference")

    static @Nullable <T extends Attributable> T setAttributionSource(

            @Nullable T attributable, @NonNull AttributionSource attributionSource) {

        if (attributable != null) {

framework/java/android/bluetooth/BluetoothA2dp.java

+1 −1
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    }



    @Override

    @SuppressWarnings("Finalize") // empty finalize for api signature

    public void finalize() {

        // The empty finalize needs to be kept or the

        // cts signature tests would fail.
@@ -542,7 +543,6 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * #PRIORITY_OFF}

     *

     * @param device Paired bluetooth device

     * @param priority

     * @return true if priority is set, false on error

     * @hide

     */

framework/java/android/bluetooth/BluetoothA2dpSink.java

+2 −2
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
    }



    @Override

    @SuppressWarnings("Finalize") // empty finalize for api signature

    public void finalize() {}



    /**
@@ -294,7 +295,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     *

     * @param device Remote bluetooth device.

     * @return audio configuration for the device, or null

     *     <p>{@see BluetoothAudioConfig}

     * @see BluetoothAudioConfig

     * @hide

     */

    @RequiresLegacyBluetoothPermission
@@ -327,7 +328,6 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     * #PRIORITY_OFF}

     *

     * @param device Paired bluetooth device

     * @param priority

     * @return true if priority is set, false on error

     * @hide

     */