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

am 68c6188b: am dd79a33b: Auto-connect Bluetooth device only when user initiates pairing.

Browse Source 
Merge commit '68c6188b91ca4034caeff7527487513c8cb012f8'

* commit '68c6188b91ca4034caeff7527487513c8cb012f8':
  Auto-connect Bluetooth device only when user initiates pairing.
This commit is contained in:
Jake Hamby
2010-09-24 17:19:24 -07:00
committed by Android Git Automerger
parent 2aae224a94 68c6188b91
commit 989408cc70
6 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothEventRedirector.java
View File

@@ -85,7 +85,7 @@ public class BluetoothEventRedirector {
if (bondState == BluetoothDevice.BOND_NONE) {
if (device.isBluetoothDock()) {
// After a dock is unpaired, we will forget the
// setttings
// settings
mManager.removeDockAutoConnectSetting(device.getAddress());
// if the device is undocked, remove it from the list as

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

@@ -91,6 +91,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
// See mConnectAttempted
private static final long MAX_UUID_DELAY_FOR_AUTO_CONNECT = 5000;
/** Auto-connect after pairing only if locally initiated. */
private boolean mConnectAfterPairing;
/**
* Describes the current device and profile for logging.
@@ -365,7 +367,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
if (!mDevice.createBond()) {
mLocalManager.showError(mDevice, R.string.bluetooth_error_title,
R.string.bluetooth_pairing_error_message);
return;
}
mConnectAfterPairing = true; // auto-connect after pairing
}
public void unpair() {
@@ -617,9 +622,19 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
public void onBondingStateChanged(int bondState) {
if (bondState == BluetoothDevice.BOND_NONE) {
mProfiles.clear();
mConnectAfterPairing = false; // cancel auto-connect
}
refresh();
if (bondState == BluetoothDevice.BOND_BONDED) {
if (mDevice.isBluetoothDock()) {
onBondingDockConnect();
} else if (mConnectAfterPairing) {
connect();
}
mConnectAfterPairing = false;
}
}
public void setBtClass(BluetoothClass btClass) {

9
src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
View File

@@ -182,15 +182,6 @@ public class CachedBluetoothDeviceManager {
}
cachedDevice.onBondingStateChanged(bondState);
if (bondState == BluetoothDevice.BOND_BONDED) {
// Auto-connect after pairing
if (!device.isBluetoothDock()) {
cachedDevice.connect();
} else {
cachedDevice.onBondingDockConnect();
}
}
}
/**

2
src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
View File

@@ -72,7 +72,7 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
}
if (device == null) {
Log.w(TAG, "Activity started without a remote blueototh device");
Log.w(TAG, "Activity started without a remote Bluetooth device");
finish();
}

5
src/com/android/settings/bluetooth/LocalBluetoothManager.java
View File

@@ -45,9 +45,8 @@ public class LocalBluetoothManager {
private static final String SHARED_PREFERENCES_NAME = "bluetooth_settings";
/** Singleton instance. */
private static LocalBluetoothManager INSTANCE;
/** Used when obtaining a reference to the singleton instance. */
private static Object INSTANCE_LOCK = new Object();
private boolean mInitialized;
private Context mContext;
@@ -86,7 +85,7 @@ public class LocalBluetoothManager {
private long mLastScan;
public static LocalBluetoothManager getInstance(Context context) {
synchronized (INSTANCE_LOCK) {
synchronized (LocalBluetoothManager.class) {
if (INSTANCE == null) {
INSTANCE = new LocalBluetoothManager();
}

2
src/com/android/settings/bluetooth/SettingsBtStatus.java
View File

@@ -31,7 +31,7 @@ public class SettingsBtStatus {
public static final int CONNECTION_STATUS_UNKNOWN = 0;
public static final int CONNECTION_STATUS_ACTIVE = 1;
/** Use {@link #isConnected} to check for the connected state */
/** Use {@link #isConnectionStatusConnected} to check for the connected state */
public static final int CONNECTION_STATUS_CONNECTED = 2;
public static final int CONNECTION_STATUS_CONNECTING = 3;
public static final int CONNECTION_STATUS_DISCONNECTED = 4;