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

Commit 6368b25c authored by Michael Chan's avatar Michael Chan Committed by Android (Google) Code Review
Browse files

Merge "b/2608693 Fix the problem where BT was automatically reconnecting ...... 

Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
parents b99e029d 96b0c1dc

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

+17 −25
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
    private static final long MAX_WAIT_TIME_FOR_FRAMEWORK = 25 * 1000;



    private enum BluetoothCommand {

        CONNECT, DISCONNECT,

        CONNECT, DISCONNECT, REMOVE_BOND,

    }



    static class BluetoothJob {
@@ -118,7 +118,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
            StringBuilder sb = new StringBuilder();

            sb.append(command.name());

            sb.append(" Address:").append(cachedDevice.mDevice);

            if (profile != null) {

                sb.append(" Profile:").append(profile.name());

            }

            sb.append(" TimeSent:");

            if (timeSent == 0) {

                sb.append("not yet");
@@ -210,6 +212,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
            case DISCONNECT:

                successful = disconnectInt(job.cachedDevice, job.profile);

                break;

            case REMOVE_BOND:

                BluetoothDevice dev = job.cachedDevice.getDevice();

                if (dev != null) {

                    successful = dev.removeBond();

                }

                break;

            }



            if (successful) {
@@ -510,32 +518,16 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
    }



    public void unpair() {

        synchronized (workQueue) {

            // Remove any pending commands for this device

            boolean processNow = false;

            Iterator<BluetoothJob> it = workQueue.iterator();

            while (it.hasNext()) {

                BluetoothJob job = it.next();

                if (job.cachedDevice.mDevice.equals(this.mDevice)) {

                    it.remove();

                    if (job.timeSent != 0) {

                        processNow = true;

                    }

                }

            }

            if (processNow) {

                processCommands();

            }

        }

        disconnect();



        switch (getBondState()) {

        case BluetoothDevice.BOND_BONDED:

            mDevice.removeBond();

            break;

        int state = getBondState();



        case BluetoothDevice.BOND_BONDING:

        if (state == BluetoothDevice.BOND_BONDING) {

            mDevice.cancelBondProcess();

            break;

        }



        if (state != BluetoothDevice.BOND_NONE) {

            queueCommand(new BluetoothJob(BluetoothCommand.REMOVE_BOND, this, null));

        }

    }