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

Commit cdbab127 authored by Joseph Pirozzo's avatar Joseph Pirozzo
Browse files

Check PBAP Server before disconnecting 

Update disconnect logic to ensure that the proxy to the PBAP server
exists before issueing disconnect.  This brings the code in line with
several of the connect calls.

Bug: 123700890
Test: Disable PBAP server from config, and disconnect a paired device.
Change-Id: Ie14feb5c0fb70f1ed68ba21bc12b4d3349933cc6
parent 8a996612

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settingslib.bluetooth;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHearingAid;
@@ -28,7 +29,7 @@ import android.os.ParcelUuid; 
import android.os.SystemClock;

import android.text.TextUtils;

import android.util.Log;

import android.bluetooth.BluetoothAdapter;



import androidx.annotation.VisibleForTesting;



import com.android.settingslib.R;
@@ -205,7 +206,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        // This is to ensure all the profiles are disconnected as some CK/Hs do not

        // disconnect  PBAP connection when HF connection is brought down

        PbapServerProfile PbapProfile = mProfileManager.getPbapProfile();

        if (PbapProfile.getConnectionStatus(mDevice) == BluetoothProfile.STATE_CONNECTED)

        if (PbapProfile != null && isConnectedProfile(PbapProfile))

        {

            PbapProfile.disconnect(mDevice);

        }