Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Simply logic for connect and disconnect in HeadsetProfile"

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-30 01:55:56 +00:00
committed by Gerrit Code Review
parent 8593fc6c06 edd44ec292
commit 7aae482135
1 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java
View File

@@ -36,7 +36,6 @@ import java.util.List;
*/
public class HeadsetProfile implements LocalBluetoothProfile {
private static final String TAG = "HeadsetProfile";
private static boolean V = true;
private BluetoothHeadset mService;
private boolean mIsProfileReady;
@@ -60,7 +59,7 @@ public class HeadsetProfile implements LocalBluetoothProfile {
implements BluetoothProfile.ServiceListener {
public void onServiceConnected(int profile, BluetoothProfile proxy) {
if (V) Log.d(TAG,"Bluetooth service connected");
Log.d(TAG,"Bluetooth service connected");
mService = (BluetoothHeadset) proxy;
// We just bound to the service, so refresh the UI for any connected HFP devices.
List<BluetoothDevice> deviceList = mService.getConnectedDevices();
@@ -82,7 +81,7 @@ public class HeadsetProfile implements LocalBluetoothProfile {
}
public void onServiceDisconnected(int profile) {
if (V) Log.d(TAG,"Bluetooth service disconnected");
Log.d(TAG,"Bluetooth service disconnected");
mProfileManager.callServiceDisconnectedListeners();
mIsProfileReady=false;
}
@@ -116,80 +115,76 @@ public class HeadsetProfile implements LocalBluetoothProfile {
}
public boolean connect(BluetoothDevice device) {
if (mService == null) return false;
List<BluetoothDevice> sinks = mService.getConnectedDevices();
if (sinks != null) {
for (BluetoothDevice sink : sinks) {
Log.d(TAG,"Not disconnecting device = " + sink);
}
if (mService == null) {
return false;
}
return mService.connect(device);
}
public boolean disconnect(BluetoothDevice device) {
if (mService == null) return false;
List<BluetoothDevice> deviceList = mService.getConnectedDevices();
if (!deviceList.isEmpty()) {
for (BluetoothDevice dev : deviceList) {
if (dev.equals(device)) {
if (V) Log.d(TAG,"Downgrade priority as user" +
"is disconnecting the headset");
// Downgrade priority as user is disconnecting the headset.
if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
}
return mService.disconnect(device);
}
}
if (mService == null) {
return false;
}
return false;
// Downgrade priority as user is disconnecting the headset.
if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
}
return mService.disconnect(device);
}
public int getConnectionStatus(BluetoothDevice device) {
if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
List<BluetoothDevice> deviceList = mService.getConnectedDevices();
if (!deviceList.isEmpty()){
for (BluetoothDevice dev : deviceList) {
if (dev.equals(device)) {
return mService.getConnectionState(device);
}
}
if (mService == null) {
return BluetoothProfile.STATE_DISCONNECTED;
}
return BluetoothProfile.STATE_DISCONNECTED;
return mService.getConnectionState(device);
}
public boolean setActiveDevice(BluetoothDevice device) {
if (mService == null) return false;
if (mService == null) {
return false;
}
return mService.setActiveDevice(device);
}
public BluetoothDevice getActiveDevice() {
if (mService == null) return null;
if (mService == null) {
return null;
}
return mService.getActiveDevice();
}
public boolean isAudioOn() {
if (mService == null) return false;
if (mService == null) {
return false;
}
return mService.isAudioOn();
}
public int getAudioState(BluetoothDevice device) {
if (mService == null) return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;
if (mService == null) {
return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;
}
return mService.getAudioState(device);
}
public boolean isPreferred(BluetoothDevice device) {
if (mService == null) return false;
if (mService == null) {
return false;
}
return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
}
public int getPreferred(BluetoothDevice device) {
if (mService == null) return BluetoothProfile.PRIORITY_OFF;
if (mService == null) {
return BluetoothProfile.PRIORITY_OFF;
}
return mService.getPriority(device);
}
public void setPreferred(BluetoothDevice device, boolean preferred) {
if (mService == null) return;
if (mService == null) {
return;
}
if (preferred) {
if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -200,7 +195,9 @@ public class HeadsetProfile implements LocalBluetoothProfile {
}
public List<BluetoothDevice> getConnectedDevices() {
if (mService == null) return new ArrayList<BluetoothDevice>(0);
if (mService == null) {
return new ArrayList<BluetoothDevice>(0);
}
return mService.getDevicesMatchingConnectionStates(
new int[] {BluetoothProfile.STATE_CONNECTED,
BluetoothProfile.STATE_CONNECTING,
@@ -238,7 +235,7 @@ public class HeadsetProfile implements LocalBluetoothProfile {
}
protected void finalize() {
if (V) Log.d(TAG, "finalize()");
Log.d(TAG, "finalize()");
if (mService != null) {
try {
BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HEADSET,