PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call disconnect / connect without checking the current status

Browse Source 
Its the job of the framework to check that, it already does that.
Framework will queue the commands. Earlier settings app used to queue
them.

Bug: 3076404

Change-Id: I664e1c4e2c0ef9c697066251ccca382ad12dfa2f
This commit is contained in:
Jaikumar Ganesh
2010-10-12 16:14:10 -07:00
parent 737e91efb1
commit d3a460cce7
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/bluetooth/CachedBluetoothDevice.java
View File

@@ -163,19 +163,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager profileManager =
LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile); LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
int status = profileManager.getConnectionStatus(cachedDevice.mDevice); int status = profileManager.getConnectionStatus(cachedDevice.mDevice);
if (SettingsBtStatus.isConnectionStatusConnected(status)) {
if (profileManager.disconnect(cachedDevice.mDevice)) { if (profileManager.disconnect(cachedDevice.mDevice)) {
if (D) { if (D) {
Log.d(TAG, "Command sent successfully:DISCONNECT " + describe(profile)); Log.d(TAG, "Command sent successfully:DISCONNECT " + describe(profile));
} }
return true; return true;
} }
if (V) {
Log.v(TAG, "Framework rejected command immediately:DISCONNECT " +
describe(profile));
}
}
return false; return false;
} }
@@ -302,7 +295,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager profileManager =
LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile); LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
int status = profileManager.getConnectionStatus(cachedDevice.mDevice); int status = profileManager.getConnectionStatus(cachedDevice.mDevice);
if (!SettingsBtStatus.isConnectionStatusConnected(status)) {
if (profileManager.connect(cachedDevice.mDevice)) { if (profileManager.connect(cachedDevice.mDevice)) {
if (D) { if (D) {
Log.d(TAG, "Command sent successfully:CONNECT " + describe(profile)); Log.d(TAG, "Command sent successfully:CONNECT " + describe(profile));
@@ -310,9 +302,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
return true; return true;
} }
Log.i(TAG, "Failed to connect " + profile.toString() + " to " + cachedDevice.mName); Log.i(TAG, "Failed to connect " + profile.toString() + " to " + cachedDevice.mName);
} else {
Log.i(TAG, "Already connected");
}
return false; return false;
} }