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

Commit 1b755dea authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android (Google) Code Review
Browse files

Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread

parents 94260caf e984291f

core/java/android/server/BluetoothService.java

+1 −15
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ public class BluetoothService extends IBluetooth.Stub { 
    private static final int MESSAGE_REGISTER_SDP_RECORDS = 1;

    private static final int MESSAGE_FINISH_DISABLE = 2;

    private static final int MESSAGE_UUID_INTENT = 3;

    private static final int MESSAGE_DISCOVERABLE_TIMEOUT = 4;

    private static final int MESSAGE_AUTO_PAIRING_FAILURE_ATTEMPT_DELAY = 5;



    // The time (in millisecs) to delay the pairing attempt after the first
@@ -501,15 +500,6 @@ public class BluetoothService extends IBluetooth.Stub { 
                    makeServiceChannelCallbacks(address);

                }

                break;

            case MESSAGE_DISCOVERABLE_TIMEOUT:

                int mode = msg.arg1;

                if (isEnabledInternal()) {

                    // TODO: Switch back to the previous scan mode

                    // This is ok for now, because we only use

                    // CONNECTABLE and CONNECTABLE_DISCOVERABLE

                    setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE, -1);

                }

                break;

            case MESSAGE_AUTO_PAIRING_FAILURE_ATTEMPT_DELAY:

                address = (String)msg.obj;

                if (address != null) {
@@ -1078,21 +1068,17 @@ public class BluetoothService extends IBluetooth.Stub { 


        switch (mode) {

        case BluetoothAdapter.SCAN_MODE_NONE:

            mHandler.removeMessages(MESSAGE_DISCOVERABLE_TIMEOUT);

            pairable = false;

            discoverable = false;

            break;

        case BluetoothAdapter.SCAN_MODE_CONNECTABLE:

            mHandler.removeMessages(MESSAGE_DISCOVERABLE_TIMEOUT);

            pairable = true;

            discoverable = false;

            break;

        case BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE:

            mHandler.removeMessages(MESSAGE_DISCOVERABLE_TIMEOUT);

            setDiscoverableTimeout(duration);

            pairable = true;

            discoverable = true;

            Message msg = mHandler.obtainMessage(MESSAGE_DISCOVERABLE_TIMEOUT);

            mHandler.sendMessageDelayed(msg, duration * 1000);

            if (DBG) Log.d(TAG, "BT Discoverable for " + duration + " seconds");

            break;

        default: