OSDN Git Service

Auto-connect Bluetooth device only when user initiates pairing.
authorJake Hamby <jhamby@google.com>
Fri, 24 Sep 2010 02:16:28 +0000 (19:16 -0700)
committerJake Hamby <jhamby@google.com>
Fri, 24 Sep 2010 21:23:26 +0000 (14:23 -0700)
commitdd79a33ba53fec530094f4d2fe37f0538530d9f8
tree6bb1bfbb83d08bb12701f0fd53c8bbd353688147
parentb2fa8719a483a3ab36a8d919641714551c470bb8
Auto-connect Bluetooth device only when user initiates pairing.

Fix bug 2271901: do not auto-connect to services on a BT device
when pairing was initiated by the device (e.g. for OPP file transfer).

Also corrected some typos and removed an unneeded lock object in
LocalBluetoothManager (synchronize on .class object instead, like
android.bluetooth.BluetoothDevice.getService() does).

Change-Id: I121105c6eee2658129f6094786754bbc7932d324
src/com/android/settings/bluetooth/BluetoothEventRedirector.java
src/com/android/settings/bluetooth/CachedBluetoothDevice.java
src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
src/com/android/settings/bluetooth/LocalBluetoothManager.java
src/com/android/settings/bluetooth/SettingsBtStatus.java