diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2015-09-04 00:28:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 00:28:09 +0000 |
| commit | f1ed1fdb4578c205ebe2d1af6f49512219506254 (patch) | |
| tree | 85463027f33becdc5004ea04a07174792aa0ad5e /packages/SettingsLib | |
| parent | 4a90942ea75039f916d8371111fdc41a80039b98 (diff) | |
| parent | 1b03cd8e1b79280e892f81709ced42b990a8905d (diff) | |
| download | frameworks_base-f1ed1fdb4578c205ebe2d1af6f49512219506254.zip frameworks_base-f1ed1fdb4578c205ebe2d1af6f49512219506254.tar.gz frameworks_base-f1ed1fdb4578c205ebe2d1af6f49512219506254.tar.bz2 | |
am 1b03cd8e: am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '1b03cd8e1b79280e892f81709ced42b990a8905d':
Bluetooth: Fix profile auto-connect logic
Diffstat (limited to 'packages/SettingsLib')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index b0429ef..e4b1ed8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -539,10 +539,10 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe * Otherwise, allow the connect on UUID change. */ if (!mProfiles.isEmpty() - && ((mConnectAttempted + timeout) > SystemClock.elapsedRealtime() - || (mConnectAttempted == 0))) { + && ((mConnectAttempted + timeout) > SystemClock.elapsedRealtime())) { connectWithoutResettingTimer(false); } + dispatchAttributesChanged(); } |