Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1d5e2e291d4c3fbcde1425af74644a24c94e1577':
  Bluetooth: Fix profile auto-connect logic
This commit is contained in:
Andre Eisenbach
2015-09-04 00:12:33 +00:00
committed by Android Git Automerger
parent f615872cb4 1d5e2e291d
commit 1b03cd8e1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -539,10 +539,10 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe
* Otherwise, allow the connect on UUID change. * Otherwise, allow the connect on UUID change.
*/ */
if (!mProfiles.isEmpty() if (!mProfiles.isEmpty()
&& ((mConnectAttempted + timeout) > SystemClock.elapsedRealtime() && ((mConnectAttempted + timeout) > SystemClock.elapsedRealtime())) {
|| (mConnectAttempted == 0))) {
connectWithoutResettingTimer(false); connectWithoutResettingTimer(false);
} }
dispatchAttributesChanged(); dispatchAttributesChanged();
} }