Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev

2015-09-04 00:02:57 +00:00
parent 0b887e579b 7be83c578c
commit 1d5e2e291d
1 changed files with 2 additions and 2 deletions
--- 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();
    }