Projects >> packages_apps_Settings >>eeb7803a9545e5574ef70831285f5121fe68a564

Chunk
Conflicting content 
import android.content.IntentFilter;
import android.os.Handler;
import android.os.SystemProperties;
<<<<<<< HEAD
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;

import com.android.settings.R;
=======
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.CheckBoxPreference;
import android.provider.Settings;
import android.util.Log;
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff

/**
 * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
Solution content 
import android.content.IntentFilter;
import android.os.Handler;
import android.os.SystemProperties;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;

import com.android.settings.R;

/**
 * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
File
BluetoothDiscoverableEnabler.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private static final String SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT =
            "debug.bt.discoverable_time";

<<<<<<< HEAD
    private static final int DISCOVERABLE_TIMEOUT_TWO_MINUTES = 120;
    private static final int DISCOVERABLE_TIMEOUT_FIVE_MINUTES = 300;
    private static final int DISCOVERABLE_TIMEOUT_ONE_HOUR = 3600;
    static final int DISCOVERABLE_TIMEOUT_NEVER = 0;

=======
    static final int DISCOVERABLE_TIMEOUT_TWO_MINUTES = 120;
    static final int DISCOVERABLE_TIMEOUT_FIVE_MINUTES = 300;
    static final int DISCOVERABLE_TIMEOUT_ONE_HOUR = 3600;
    static final int DISCOVERABLE_TIMEOUT_NEVER = 0;

    static final String SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP =
        "discoverable_end_timestamp";

>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
    private static final String VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES = "twomin";
    private static final String VALUE_DISCOVERABLE_TIMEOUT_FIVE_MINUTES = "fivemin";
    private static final String VALUE_DISCOVERABLE_TIMEOUT_ONE_HOUR = "onehour";
Solution content 
    private static final String SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT =
            "debug.bt.discoverable_time";

    private static final int DISCOVERABLE_TIMEOUT_TWO_MINUTES = 120;
    private static final int DISCOVERABLE_TIMEOUT_FIVE_MINUTES = 300;
    private static final int DISCOVERABLE_TIMEOUT_ONE_HOUR = 3600;
    static final int DISCOVERABLE_TIMEOUT_NEVER = 0;

    private static final String VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES = "twomin";
    private static final String VALUE_DISCOVERABLE_TIMEOUT_FIVE_MINUTES = "fivemin";
    private static final String VALUE_DISCOVERABLE_TIMEOUT_ONE_HOUR = "onehour";
File
BluetoothDiscoverableEnabler.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    private static final String VALUE_DISCOVERABLE_TIMEOUT_ONE_HOUR = "onehour";
    private static final String VALUE_DISCOVERABLE_TIMEOUT_NEVER = "never";

<<<<<<< HEAD
=======
    // no need for this timeout anymore since we have the listPreference default value
    // leaving now temporary until requestpermissionactivity is modified..
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
    static final int DEFAULT_DISCOVERABLE_TIMEOUT = DISCOVERABLE_TIMEOUT_TWO_MINUTES;

    private final Context mContext;
Solution content 
    private static final String VALUE_DISCOVERABLE_TIMEOUT_ONE_HOUR = "onehour";
    private static final String VALUE_DISCOVERABLE_TIMEOUT_NEVER = "never";

    static final int DEFAULT_DISCOVERABLE_TIMEOUT = DISCOVERABLE_TIMEOUT_TWO_MINUTES;

    private final Context mContext;
File
BluetoothDiscoverableEnabler.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        }
    };

<<<<<<< HEAD
    BluetoothDiscoverableEnabler(Context context, LocalBluetoothAdapter adapter,
=======
    public BluetoothDiscoverableEnabler(Context context,
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
            CheckBoxPreference checkBoxPreference, ListPreference timeoutListPreference) {
        mContext = context;
        mUiHandler = new Handler();
Solution content 
        }
    };

    BluetoothDiscoverableEnabler(Context context, LocalBluetoothAdapter adapter,
            CheckBoxPreference checkBoxPreference, ListPreference timeoutListPreference) {
        mContext = context;
        mUiHandler = new Handler();
File
BluetoothDiscoverableEnabler.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
    public void pause() {
        mContext.registerReceiver(mReceiver, filter);
        mCheckBoxPreference.setOnPreferenceChangeListener(this);
        mTimeoutListPreference.setOnPreferenceChangeListener(this);
<<<<<<< HEAD
        handleModeChanged(mLocalAdapter.getScanMode());
=======
        handleModeChanged(mLocalManager.getBluetoothAdapter().getScanMode());
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
    }
Solution content 
        mContext.registerReceiver(mReceiver, filter);
        mCheckBoxPreference.setOnPreferenceChangeListener(this);
        mTimeoutListPreference.setOnPreferenceChangeListener(this);
        handleModeChanged(mLocalAdapter.getScanMode());
    }

    public void pause() {
File
BluetoothDiscoverableEnabler.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            mLocalAdapter.setDiscoverableTimeout(timeout);

            long endTimestamp = System.currentTimeMillis() + timeout * 1000L;
<<<<<<< HEAD
            LocalBluetoothPreferences.persistDiscoverableEndTimestamp(mContext, endTimestamp);

            updateCountdownSummary();

            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
=======
            persistDiscoverableEndTimestamp(endTimestamp);

            updateCountdownSummary();

            manager.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
        } else {
            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
        }
Solution content 
            mLocalAdapter.setDiscoverableTimeout(timeout);

            long endTimestamp = System.currentTimeMillis() + timeout * 1000L;
            LocalBluetoothPreferences.persistDiscoverableEndTimestamp(mContext, endTimestamp);

            updateCountdownSummary();

            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
        } else {
            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
        }
File
BluetoothDiscoverableEnabler.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    private int getDiscoverableTimeout() {
        int timeout = SystemProperties.getInt(SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT, -1);
        if (timeout < 0) {
<<<<<<< HEAD
            String timeoutValue = mTimeoutListPreference.getValue();
            if (timeoutValue == null) {
=======
            String timeoutValue = null;
            if (mTimeoutListPreference != null && mTimeoutListPreference.getValue() != null) {
                timeoutValue = mTimeoutListPreference.getValue().toString();
            } else {
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
                mTimeoutListPreference.setValue(VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES);
                return DISCOVERABLE_TIMEOUT_TWO_MINUTES;
            }
Solution content 
    private int getDiscoverableTimeout() {
        int timeout = SystemProperties.getInt(SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT, -1);
        if (timeout < 0) {
            String timeoutValue = mTimeoutListPreference.getValue();
            if (timeoutValue == null) {
                mTimeoutListPreference.setValue(VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES);
                return DISCOVERABLE_TIMEOUT_TWO_MINUTES;
            }
File
BluetoothDiscoverableEnabler.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
<<<<<<< HEAD
import android.util.Log;
=======
import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen;
import android.text.TextUtils;
import android.view.ContextMenu;
import android.view.MenuItem;
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
import android.view.View;

import com.android.settings.R;
Solution content 
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.util.Log;
import android.view.View;

import com.android.settings.R;
File
BluetoothSettings.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private static final String KEY_BT_CHECKBOX = "bt_checkbox";
    private static final String KEY_BT_DISCOVERABLE = "bt_discoverable";
<<<<<<< HEAD
=======
    private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
    private static final String KEY_BT_DISCOVERABLE_TIMEOUT = "bt_discoverable_timeout";
    private static final String KEY_BT_NAME = "bt_name";
    private static final String KEY_BT_SHOW_RECEIVED = "bt_show_received_files";
Solution content 
    private static final String KEY_BT_CHECKBOX = "bt_checkbox";
    private static final String KEY_BT_DISCOVERABLE = "bt_discoverable";
    private static final String KEY_BT_DISCOVERABLE_TIMEOUT = "bt_discoverable_timeout";
    private static final String KEY_BT_NAME = "bt_name";
    private static final String KEY_BT_SHOW_RECEIVED = "bt_show_received_files";
File
BluetoothSettings.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
        mEnabler = new BluetoothEnabler(getActivity(),
                (CheckBoxPreference) findPreference(KEY_BT_CHECKBOX));

<<<<<<< HEAD
        mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
                mLocalAdapter,
                (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE),
=======
            mDiscoverableEnabler = new BluetoothDiscoverableEnabler(this,
                    (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE),
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
                    (ListPreference) findPreference(KEY_BT_DISCOVERABLE_TIMEOUT));

        mNamePreference = (BluetoothNamePreference) findPreference(KEY_BT_NAME);
Solution content 
        mEnabler = new BluetoothEnabler(getActivity(),
                (CheckBoxPreference) findPreference(KEY_BT_CHECKBOX));

        mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
                mLocalAdapter,
                (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE),
                    (ListPreference) findPreference(KEY_BT_DISCOVERABLE_TIMEOUT));

        mNamePreference = (BluetoothNamePreference) findPreference(KEY_BT_NAME);
File
BluetoothSettings.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        } else {
            // Ask the user whether to turn on discovery mode or not
            // For lasting discoverable mode there is a different message
<<<<<<< HEAD
            if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) {
                builder.setMessage(
                        getString(R.string.bluetooth_ask_lasting_discovery));
            } else {
                builder.setMessage(
                        getString(R.string.bluetooth_ask_discovery, mTimeout));
=======
            // TODO(): Revisit this when public APIs for discoverable timeout are introduced.
            if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) {
                builder.setMessage(
                        getString(R.string.bluetooth_ask_enablement_and_lasting_discovery));
            } else {
                builder.setMessage(
                        getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout));
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
            }
            builder.setPositiveButton(getString(R.string.yes), this);
            builder.setNegativeButton(getString(R.string.no), this);
Solution content 
        } else {
            // Ask the user whether to turn on discovery mode or not
            // For lasting discoverable mode there is a different message
            if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) {
                builder.setMessage(
                        getString(R.string.bluetooth_ask_lasting_discovery));
            } else {
                builder.setMessage(
                        getString(R.string.bluetooth_ask_discovery, mTimeout));
            }
            builder.setPositiveButton(getString(R.string.yes), this);
            builder.setNegativeButton(getString(R.string.no), this);
File
RequestPermissionActivity.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Chunk
Conflicting content 
            Log.d(TAG, "Setting Bluetooth Discoverable Timeout = " + mTimeout);

<<<<<<< HEAD
            if (mTimeout < 0 || mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
=======
            // Right now assuming for simplicity that an app can pick any int value,
            // and if equal to BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER
            // it will be treated as a request for lasting discoverability.
            // Alternatively, a check can be added here for enforcing the specific allowed values
            // as listed in BluetoothDiscoverableEnabler.
            // We need to make all these value public.

            if (mTimeout <= 0) {
>>>>>>> aeca185107481f28ad248c4f811bd708be8f5bff
                mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
            }
        } else {
Solution content 
            Log.d(TAG, "Setting Bluetooth Discoverable Timeout = " + mTimeout);

            if (mTimeout < 0 || mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
                mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
            }
        } else {
File
RequestPermissionActivity.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement