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

Commit a54b373a authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "Fixes typo in new BluetoothAdapter API... 

Merge "Fixes typo in new BluetoothAdapter API unregisterPreferredAudioProfilesChangedCallback" am: 43f6a451

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



Change-Id: I91af234bdf4e37dc444c64d511eab4e8dc2498d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14e63990 43f6a451

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int startRfcommServer(@NonNull String, @NonNull java.util.UUID, @NonNull android.app.PendingIntent);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int stopRfcommServer(@NonNull java.util.UUID);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean unregisterBluetoothConnectionCallback(@NonNull android.bluetooth.BluetoothAdapter.BluetoothConnectionCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int unregisterPreferredAudiProfilesChangedCallback(@NonNull android.bluetooth.BluetoothAdapter.PreferredAudioProfilesChangedCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int unregisterPreferredAudioProfilesChangedCallback(@NonNull android.bluetooth.BluetoothAdapter.PreferredAudioProfilesChangedCallback);

    field public static final String ACTION_BLE_STATE_CHANGED = "android.bluetooth.adapter.action.BLE_STATE_CHANGED";

    field public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE = "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_REQUEST_DISABLE = "android.bluetooth.adapter.action.REQUEST_DISABLE";

framework/java/android/bluetooth/BluetoothAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -5221,7 +5221,7 @@ public final class BluetoothAdapter { 
    /**

     * Registers a callback to be notified when the preferred audio profile changes have taken

     * effect. To unregister this callback, call

     * {@link #unregisterPreferredAudiProfilesChangedCallback(

     * {@link #unregisterPreferredAudioProfilesChangedCallback(

     * PreferredAudioProfilesChangedCallback)}.

     *

     * @param executor an {@link Executor} to execute the callbacks
@@ -5313,9 +5313,9 @@ public final class BluetoothAdapter { 
            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    @UnRegisterPreferredAudioProfilesCallbackReturnValues

    public int unregisterPreferredAudiProfilesChangedCallback(

    public int unregisterPreferredAudioProfilesChangedCallback(

            @NonNull PreferredAudioProfilesChangedCallback callback) {

        if (DBG) Log.d(TAG, "unregisterPreferredAudiProfilesChangedCallback()");

        if (DBG) Log.d(TAG, "unregisterPreferredAudioProfilesChangedCallback()");

        Objects.requireNonNull(callback, "callback cannot be null");



        synchronized (mAudioProfilesChangedCallbackExecutorMap) {