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

Commit 07195f62 authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge "The BluetoothHeadsetClient connection action no longer matches manifest" am: 0cc824d6 

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

Change-Id: Id689afa9235cddc291e7c14e6cae25657b708f00
parents eb863633 0cc824d6

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.headsetprofile.action.CONNECTION_STATE_CHANGED";

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.headsetclient.profile.action.CONNECTION_STATE_CHANGED";

  }



  public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {

framework/java/android/bluetooth/BluetoothHeadsetClient.java

+5 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
 * limitations under the License.

 */

package android.bluetooth;



import static android.bluetooth.BluetoothUtils.getSyncTimeout;



import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;
@@ -32,7 +34,9 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.util.CloseGuard;

import android.util.Log;



import com.android.modules.utils.SynchronousResultReceiver;



import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.TimeoutException;
@@ -76,7 +80,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose 
    })

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_STATE_CHANGED =

            "android.bluetooth.headsetprofile.action.CONNECTION_STATE_CHANGED";

            "android.bluetooth.headsetclient.profile.action.CONNECTION_STATE_CHANGED";

    /**

     * Intent sent whenever audio state changes.

     *