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

Commit 93961f9f authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Move some members to the "Q blacklist"." am: f83d9d81 

am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e
parents 444e0226 f83d9d81

framework/java/android/bluetooth/BluetoothA2dp.java

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.ServiceConnection;

import android.os.Binder;

import android.os.Build;

import android.os.IBinder;

import android.os.ParcelUuid;

import android.os.RemoteException;
@@ -571,7 +572,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public int getPriority(BluetoothDevice device) {

        if (VDBG) log("getPriority(" + device + ")");

        try {

framework/java/android/bluetooth/BluetoothGatt.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.bluetooth;



import android.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Handler;

import android.os.ParcelUuid;

import android.os.RemoteException;
@@ -52,7 +53,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    private BluetoothDevice mDevice;

    @UnsupportedAppUsage

    private boolean mAutoConnect;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    private int mAuthRetryState;

    private int mConnState;

    private final Object mStateLock = new Object();

framework/java/android/bluetooth/BluetoothProfile.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.Manifest; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.os.Build;



import java.util.List;
@@ -86,7 +87,7 @@ public interface BluetoothProfile { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    int PAN = 5;



    /**