diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2015-09-04 00:12:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 00:12:33 +0000 |
| commit | 1b03cd8e1b79280e892f81709ced42b990a8905d (patch) | |
| tree | 95642a304c6da288c85be82c84d9ce0b141250ae /packages/SettingsLib | |
| parent | f615872cb49062de9113c7c5be31d3b1d1b423af (diff) | |
| parent | 1d5e2e291d4c3fbcde1425af74644a24c94e1577 (diff) | |
| download | frameworks_base-1b03cd8e1b79280e892f81709ced42b990a8905d.zip frameworks_base-1b03cd8e1b79280e892f81709ced42b990a8905d.tar.gz frameworks_base-1b03cd8e1b79280e892f81709ced42b990a8905d.tar.bz2 | |
am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '1d5e2e291d4c3fbcde1425af74644a24c94e1577':
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(); } |