Projects >> platform_packages_apps_Settings >>93d419a290696611fa5e2bc644adf0847dfb627a

Chunk
Conflicting content 
        super.onResume();

        // Repopulate (which isn't too bad since it's cached in the settings
<<<<<<< HEAD
        // bluetooth manager)
=======
        // bluetooth manager
>>>>>>> 47cb175396c8b020eded62d6c2293b777f20932b
        addDevices();

        mEnabler.resume();
Solution content 
        super.onResume();

        // Repopulate (which isn't too bad since it's cached in the settings
        // bluetooth manager)
        addDevices();

        mEnabler.resume();
File
BluetoothSettings.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    public void onPause() {
        super.onPause();

<<<<<<< HEAD
        mNamePreference.pause();
        mDiscoverableEnabler.pause();
        mEnabler.pause();
=======
        mDevicePreferenceMap.clear();
        mDeviceList.removeAll();

        mLocalManager.setForegroundActivity(null);
        mDevicePreferenceMap.clear();
        mDeviceList.removeAll();
        unregisterReceiver(mReceiver);

        mLocalManager.unregisterCallback(this);
        if (mScreenType == SCREEN_TYPE_SETTINGS) {
            mNamePreference.pause();
            mDiscoverableEnabler.pause();
            mEnabler.pause();
        }
    }

    @Override
    protected void onUserLeaveHint() {
        super.onUserLeaveHint();
        mLocalManager.stopScanning();
    }

    private void addDevices() {
        List cachedDevices =
                mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
        for (CachedBluetoothDevice cachedDevice : cachedDevices) {
            onDeviceAdded(cachedDevice);
        }
>>>>>>> 47cb175396c8b020eded62d6c2293b777f20932b
    }

    @Override
Solution content 
    public void onPause() {
        super.onPause();

        mNamePreference.pause();
        mDiscoverableEnabler.pause();
        mEnabler.pause();
    }

    @Override
File
BluetoothSettings.java
Developer's decision
Version 1
Kind of conflict
Annotation
For statement
If statement
Method declaration
Method invocation
Method signature
Variable