Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 613549a6 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I2c3621d1 into eclair 

* changes:
  Fix desk dock getting stuck after unpairing.
parents d1469da1 b172cd5d

src/com/android/settings/bluetooth/CachedBluetoothDevice.java

+6 −0
Original line number Diff line number Diff line
@@ -383,6 +383,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        connectWithoutResettingTimer();

    }



    /*package*/ void onBondingDockConnect() {

        // Don't connect just set the timer.

        // TODO(): Fix the actual problem

        mConnectAttempted = SystemClock.elapsedRealtime();

    }



    private void connectWithoutResettingTimer() {

        // Try to initialize the profiles if there were not.

        if (mProfiles.size() == 0) {

src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java

+5 −1
Original line number Diff line number Diff line
@@ -186,7 +186,11 @@ public class CachedBluetoothDeviceManager { 


        if (bondState == BluetoothDevice.BOND_BONDED) {

            // Auto-connect after pairing

            if (!device.isBluetoothDock()) {

                cachedDevice.connect();

            } else {

                cachedDevice.onBondingDockConnect();

            }

        }

    }