diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2015-09-04 00:02:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-04 00:02:57 +0000 |
| commit | 1d5e2e291d4c3fbcde1425af74644a24c94e1577 (patch) | |
| tree | d0e4cbb27ae19c4fac067e79427d696a816617ee /packages | |
| parent | 0b887e579b766012c09626e7089a3fade5415ee6 (diff) | |
| parent | 7be83c578c611cd28185333696c17b2560f30444 (diff) | |
| download | frameworks_base-1d5e2e291d4c3fbcde1425af74644a24c94e1577.zip frameworks_base-1d5e2e291d4c3fbcde1425af74644a24c94e1577.tar.gz frameworks_base-1d5e2e291d4c3fbcde1425af74644a24c94e1577.tar.bz2 | |
Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
Diffstat (limited to 'packages')
| -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(); } |