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

Commit ca9cb21a authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Fix a deadlock bug in Bluetooth Framework" am: d81a0335 am: 63993ee3 

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



Change-Id: I177a192a900ad2066432450fcad87ad4f4cf05a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 378de4c2 63993ee3

framework/java/android/bluetooth/BluetoothAdapter.java

+8 −4
Original line number Diff line number Diff line
@@ -4236,14 +4236,18 @@ public final class BluetoothAdapter { 


    /*package*/ IBluetooth getBluetoothService() {

        synchronized (sServiceLock) {

            if (sProxyServiceStateCallbacks.isEmpty()) {

                throw new IllegalStateException(

                        "Anonymous service access requires at least one lifecycle in process");

            }

            return sService;

        }

    }



    /**

     * Registers a IBluetoothManagerCallback and returns the cached

     * Bluetooth service proxy object.

     *

     * TODO: rename this API to registerBlueoothManagerCallback or something?

     * the current name does not match what it does very well.

     *

     * /

    @UnsupportedAppUsage

    /*package*/ IBluetooth getBluetoothService(IBluetoothManagerCallback cb) {

        Objects.requireNonNull(cb);

framework/java/android/bluetooth/BluetoothDevice.java

+34 −76
Original line number Diff line number Diff line
@@ -1278,55 +1278,14 @@ public final class BluetoothDevice implements Parcelable, Attributable { 


    private static final String NULL_MAC_ADDRESS = "00:00:00:00:00:00";



    /**

     * Lazy initialization. Guaranteed final after first object constructed, or

     * getService() called.

     * TODO: Unify implementation of sService amongst BluetoothFoo API's

     */

    private static volatile IBluetooth sService;



    private final String mAddress;

    @AddressType private final int mAddressType;



    private AttributionSource mAttributionSource;



    /*package*/

    static IBluetooth getService() {

        synchronized (BluetoothDevice.class) {

            if (sService == null) {

                BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

                sService = adapter.getBluetoothService(sStateChangeCallback);

            }

        }

        return sService;

    }



    static IBluetoothManagerCallback sStateChangeCallback = new IBluetoothManagerCallback.Stub() {



        public void onBluetoothServiceUp(IBluetooth bluetoothService)

                throws RemoteException {

            synchronized (BluetoothDevice.class) {

                if (sService == null) {

                    sService = bluetoothService;

                }

        return BluetoothAdapter.getDefaultAdapter().getBluetoothService();

    }

        }



        public void onBluetoothServiceDown()

                throws RemoteException {

            synchronized (BluetoothDevice.class) {

                sService = null;

            }

        }



        public void onBrEdrDown() {

            if (DBG) Log.d(TAG, "onBrEdrDown: reached BLE ON state");

        }



        public void onOobData(@Transport int transport, OobData oobData) {

            if (DBG) Log.d(TAG, "onOobData: got data");

        }

    };



    /**

     * Create a new BluetoothDevice.
@@ -1340,7 +1299,6 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
     * @hide

     */

    /*package*/ BluetoothDevice(String address, int addressType) {

        getService();  // ensures sService is initialized

        if (!BluetoothAdapter.checkBluetoothAddress(address)) {

            throw new IllegalArgumentException(address + " is not a valid Bluetooth address");

        }
@@ -1487,7 +1445,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public @Nullable String getIdentityAddress() {

        if (DBG) log("getIdentityAddress()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final String defaultValue = null;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot get identity address");
@@ -1517,7 +1475,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public String getName() {

        if (DBG) log("getName()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final String defaultValue = null;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot get Remote Device name");
@@ -1552,7 +1510,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public int getType() {

        if (DBG) log("getType()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = DEVICE_TYPE_UNKNOWN;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot get Remote Device type");
@@ -1581,7 +1539,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public String getAlias() {

        if (DBG) log("getAlias()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final String defaultValue = null;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot get Remote Device Alias");
@@ -1642,7 +1600,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
            throw new IllegalArgumentException("alias cannot be the empty string");

        }

        if (DBG) log("setAlias(" + alias + ")");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot set Remote Device name");
@@ -1676,7 +1634,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public @IntRange(from = -100, to = 100) int getBatteryLevel() {

        if (DBG) log("getBatteryLevel()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = BATTERY_LEVEL_BLUETOOTH_OFF;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "Bluetooth disabled. Cannot get remote device battery level");
@@ -1771,7 +1729,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    private boolean createBondInternal(int transport, @Nullable OobData remoteP192Data,

            @Nullable OobData remoteP256Data) {

        if (DBG) log("createBondOutOfBand()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "BT not enabled, createBondOutOfBand failed");
@@ -1804,7 +1762,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean isBondingInitiatedLocally() {

        if (DBG) log("isBondingInitiatedLocally()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "BT not enabled, isBondingInitiatedLocally failed");
@@ -1831,7 +1789,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean cancelBondProcess() {

        if (DBG) log("cancelBondProcess()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot cancel Remote Device bond");
@@ -1864,7 +1822,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean removeBond() {

        if (DBG) log("removeBond()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot remove Remote Device bond");
@@ -1959,7 +1917,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @SuppressLint("AndroidFrameworkRequiresPermission")

    public int getBondState() {

        if (DBG) log("getBondState(" + getAnonymizedAddress() + ")");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        if (service == null) {

            Log.e(TAG, "BT not enabled. Cannot get bond state");

            if (DBG) log(Log.getStackTraceString(new Throwable()));
@@ -1993,7 +1951,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean canBondWithoutDialog() {

        if (DBG) log("canBondWithoutDialog, device: " + this);

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot check if we can skip pairing dialog");
@@ -2047,7 +2005,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
        if (!BluetoothAdapter.checkBluetoothAddress(getAddress())) {

            throw new IllegalArgumentException("device cannot have an invalid address");

        }

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot connect to remote device.");
@@ -2094,7 +2052,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
        if (!BluetoothAdapter.checkBluetoothAddress(getAddress())) {

            throw new IllegalArgumentException("device cannot have an invalid address");

        }

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot disconnect to remote device.");
@@ -2126,7 +2084,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean isConnected() {

        if (DBG) log("isConnected()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = CONNECTION_STATE_DISCONNECTED;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "Proxy not attached to service");
@@ -2158,7 +2116,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean isEncrypted() {

        if (DBG) log("isEncrypted()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = CONNECTION_STATE_DISCONNECTED;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "Proxy not attached to service");
@@ -2187,7 +2145,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public BluetoothClass getBluetoothClass() {

        if (DBG) log("getBluetoothClass()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = 0;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot get Bluetooth Class");
@@ -2221,7 +2179,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public ParcelUuid[] getUuids() {

        if (DBG) log("getUuids()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final ParcelUuid[] defaultValue = null;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot get remote device Uuids");
@@ -2288,7 +2246,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean fetchUuidsWithSdp(@Transport int transport) {

        if (DBG) log("fetchUuidsWithSdp()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot fetchUuidsWithSdp");
@@ -2330,7 +2288,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean sdpSearch(ParcelUuid uuid) {

        if (DBG) log("sdpSearch()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot query remote device sdp records");
@@ -2357,7 +2315,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean setPin(byte[] pin) {

        if (DBG) log("setPin()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot set Remote Device pin");
@@ -2403,7 +2361,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean setPairingConfirmation(boolean confirm) {

        if (DBG) log("setPairingConfirmation()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "BT not enabled. Cannot set pairing confirmation");
@@ -2442,7 +2400,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public @AccessPermission int getPhonebookAccessPermission() {

        if (DBG) log("getPhonebookAccessPermission()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = ACCESS_UNKNOWN;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "Proxy not attached to service");
@@ -2489,7 +2447,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean setSilenceMode(boolean silence) {

        if (DBG) log("setSilenceMode()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            throw new IllegalStateException("Bluetooth is not turned ON");
@@ -2519,7 +2477,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean isInSilenceMode() {

        if (DBG) log("isInSilenceMode()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            throw new IllegalStateException("Bluetooth is not turned ON");
@@ -2550,7 +2508,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean setPhonebookAccessPermission(@AccessPermission int value) {

        if (DBG) log("setPhonebookAccessPermission()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "Proxy not attached to service");
@@ -2579,7 +2537,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public @AccessPermission int getMessageAccessPermission() {

        if (DBG) log("getMessageAccessPermission()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = ACCESS_UNKNOWN;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "Proxy not attached to service");
@@ -2616,7 +2574,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
            throw new IllegalArgumentException(value + "is not a valid AccessPermission value");

        }

        if (DBG) log("setMessageAccessPermission()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "Proxy not attached to service");
@@ -2645,7 +2603,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public @AccessPermission int getSimAccessPermission() {

        if (DBG) log("getSimAccessPermission()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final int defaultValue = ACCESS_UNKNOWN;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "Proxy not attached to service");
@@ -2678,7 +2636,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean setSimAccessPermission(int value) {

        if (DBG) log("setSimAccessPermission()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.w(TAG, "Proxy not attached to service");
@@ -3189,7 +3147,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean setMetadata(@MetadataKey int key, @NonNull byte[] value) {

        if (DBG) log("setMetadata()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "Bluetooth is not enabled. Cannot set metadata");
@@ -3224,7 +3182,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public byte[] getMetadata(@MetadataKey int key) {

        if (DBG) log("getMetadata()");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final byte[] defaultValue = null;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "Bluetooth is not enabled. Cannot get metadata");
@@ -3267,7 +3225,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    })

    public boolean setLowLatencyAudioAllowed(boolean allowed) {

        if (DBG) log("setLowLatencyAudioAllowed(" + allowed + ")");

        final IBluetooth service = sService;

        final IBluetooth service = getService();

        final boolean defaultValue = false;

        if (service == null || !isBluetoothEnabled()) {

            Log.e(TAG, "Bluetooth is not enabled. Cannot allow low latency");