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

am 0d5e320c: am bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread

Browse Source 
Merge commit '0d5e320cdd9cbd76012c0a1aec157e358d05891e'

* commit '0d5e320cdd9cbd76012c0a1aec157e358d05891e':
  Call disconnect / connect without checking the current status
This commit is contained in:
Jaikumar Ganesh
2010-10-14 19:30:08 -07:00
committed by Android Git Automerger
parent 2f54a66abd 0d5e320cdd
commit c0a2044b9a
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,19 +168,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;
}
if (V) {
Log.v(TAG, "Framework rejected command immediately:DISCONNECT " +
describe(profile));
} }
return true;
} }
return false; return false;
} }
@@ -324,17 +317,13 @@ 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));
}
return true;
} }
Log.i(TAG, "Failed to connect " + profile.toString() + " to " + cachedDevice.mName); return true;
} else {
Log.i(TAG, "Already connected");
} }
Log.i(TAG, "Failed to connect " + profile.toString() + " to " + cachedDevice.mName);
return false; return false;
} }