Projects >> packages_apps_Settings >>d842cee7c287f8704f44f6622ac03d38c0f682c9

Chunk
Conflicting content 
    private void fillList() {
        String where = "numeric=\""
<<<<<<< HEAD
            + android.os.SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "")
=======
            + android.os.SystemProperties.get(TelephonyProperties.PROPERTY_SIM_OPERATOR_NUMERIC, "")
>>>>>>> 43f027a086d4fb175589f335ed0f808d1894a9eb
            + "\"";

        Cursor cursor = managedQuery(Telephony.Carriers.CONTENT_URI, new String[] {
Solution content 
    private void fillList() {
        String where = "numeric=\""
            + android.os.SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "")
            + "\"";

        Cursor cursor = managedQuery(Telephony.Carriers.CONTENT_URI, new String[] {
File
ApnSettings.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    private CheckBoxPreference mNetwork;
    private CheckBoxPreference mGps;
<<<<<<< HEAD
=======
    private LocationManager mLocationManager;
>>>>>>> 43f027a086d4fb175589f335ed0f808d1894a9eb
    
    // To track whether Agree was clicked in the Network location warning dialog
    private boolean mOkClicked;
Solution content 
    private CheckBoxPreference mNetwork;
    private CheckBoxPreference mGps;
    
    // To track whether Agree was clicked in the Network location warning dialog
    private boolean mOkClicked;
File
SecuritySettings.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    }

    /*

    }
        }
                        .show()
                        .setOnDismissListener(this);
            } else {
<<<<<<< HEAD
                Settings.Secure.setLocationProviderEnabled(getContentResolver(),
                        LocationManager.NETWORK_PROVIDER, false);
            }
        } else if (preference == mGps) {
            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
                    LocationManager.GPS_PROVIDER, mGps.isChecked());
        }

        return false;
=======
                updateProviders();
            }
        } else if (preference == mGps) {
            updateProviders();
        }

        return false;
    }

    public void onClick(DialogInterface dialog, int which) {
        if (which == DialogInterface.BUTTON_POSITIVE) {
            updateProviders();
            mOkClicked = true;
        } else {
            // Reset the toggle
            mNetwork.setChecked(false);
        }
    }
    
    public void onDismiss(DialogInterface dialog) {
        // Assuming that onClick gets called first
        if (!mOkClicked) {
            mNetwork.setChecked(false);
     * Creates toggles for each available location provider
     */
    private void updateToggles() {
        String providers = getAllowedProviders();
        mNetwork.setChecked(providers.contains(LocationManager.NETWORK_PROVIDER));
        mGps.setChecked(providers.contains(LocationManager.GPS_PROVIDER));
>>>>>>> 43f027a086d4fb175589f335ed0f808d1894a9eb
    public void onClick(DialogInterface dialog, int which) {
Solution content 
                        .show()
                        .setOnDismissListener(this);
            } else {
                Settings.Secure.setLocationProviderEnabled(getContentResolver(),
                        LocationManager.NETWORK_PROVIDER, false);
            }
        } else if (preference == mGps) {
            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
                    LocationManager.GPS_PROVIDER, mGps.isChecked());
        }

        return false;
    }

    public void onClick(DialogInterface dialog, int which) {
File
SecuritySettings.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
    /*
     * Creates toggles for each available location provider
     */
<<<<<<< HEAD
    private void updateToggles() {
        mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled(
                getContentResolver(), LocationManager.NETWORK_PROVIDER));
        mGps.setChecked(Settings.Secure.isLocationProviderEnabled(
                getContentResolver(), LocationManager.GPS_PROVIDER));
=======
    private String getAllowedProviders() {
        String allowedProviders =
            Settings.Secure.getString(getContentResolver(),
                Settings.Secure.LOCATION_PROVIDERS_ALLOWED);
        if (allowedProviders == null) {
            allowedProviders = "";
        }
        return allowedProviders;
>>>>>>> 43f027a086d4fb175589f335ed0f808d1894a9eb
    }

    private boolean isToggled(Preference pref) {
Solution content 
    /*
     * Creates toggles for each available location provider
     */
    private void updateToggles() {
        mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled(
                getContentResolver(), LocationManager.NETWORK_PROVIDER));
        mGps.setChecked(Settings.Secure.isLocationProviderEnabled(
                getContentResolver(), LocationManager.GPS_PROVIDER));
    }

    private boolean isToggled(Preference pref) {
File
SecuritySettings.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
            }

            int signalDbm = mPhoneStateReceiver.getSignalStrengthDbm();
<<<<<<< HEAD

            if (-1 == signalDbm) signalDbm = 0;

            int signalAsu = mPhoneStateReceiver.getSignalStrength();

            if (-1 == signalAsu) signalAsu = 0;

=======

            if (-1 == signalDbm) signalDbm = 0;

            int signalAsu = mPhoneStateReceiver.getSignalStrength();

            if (-1 == signalAsu) signalAsu = 0;

>>>>>>> 43f027a086d4fb175589f335ed0f808d1894a9eb
            mSignalStrength.setSummary(String.valueOf(signalDbm) + " "
                        + r.getString(R.string.radioInfo_display_dbm) + "   "
                        + String.valueOf(signalAsu) + " "
Solution content 
            }

            int signalDbm = mPhoneStateReceiver.getSignalStrengthDbm();

            if (-1 == signalDbm) signalDbm = 0;

            int signalAsu = mPhoneStateReceiver.getSignalStrength();

            if (-1 == signalAsu) signalAsu = 0;

            mSignalStrength.setSummary(String.valueOf(signalDbm) + " "
                        + r.getString(R.string.radioInfo_display_dbm) + "   "
                        + String.valueOf(signalAsu) + " "
File
Status.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable