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

Commit a2f2141c authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android (Google) Code Review
Browse files

Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

parents d85621c9 fa8e2716

core/java/android/preference/PreferenceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ public class PreferenceManager { 
            pm.setSharedPreferencesMode(sharedPreferencesMode);

            pm.inflateFromResource(context, resId, null);



            defaultValueSp.edit().putBoolean(KEY_HAS_SET_DEFAULT_VALUES, true).commit();

            defaultValueSp.edit().putBoolean(KEY_HAS_SET_DEFAULT_VALUES, true).apply();

        }

    }
@@ -481,7 +481,7 @@ public class PreferenceManager { 
    

    private void setNoCommit(boolean noCommit) {

        if (!noCommit && mEditor != null) {

            mEditor.commit();

            mEditor.apply();

        }

        

        mNoCommit = noCommit;

telephony/java/com/android/internal/telephony/PhoneBase.java

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());

        SharedPreferences.Editor editor = sp.edit();

        editor.putBoolean(DNS_SERVER_CHECK_DISABLED_KEY, b);

        editor.commit();

        editor.apply();

    }



    /**

telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ public class CDMAPhone extends PhoneBase { 
        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());

        SharedPreferences.Editor editor = sp.edit();

        editor.putString(VM_NUMBER_CDMA, number);

        editor.commit();

        editor.apply();

    }



    /**

telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { 
                    mPhone.getContext());

            SharedPreferences.Editor editor = sp.edit();

            editor.putInt(CDMAPhone.VM_COUNT_CDMA, voicemailCount);

            editor.commit();

            editor.apply();

            ((CDMAPhone) mPhone).updateMessageWaitingIndicator(voicemailCount);

            handled = true;

        } else if (((SmsEnvelope.TELESERVICE_WMT == teleService) ||

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

+2 −2
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ public class GSMPhone extends PhoneBase { 
        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());

        SharedPreferences.Editor editor = sp.edit();

        editor.putString(VM_NUMBER, number);

        editor.commit();

        editor.apply();

        setVmSimImsi(getSubscriberId());

    }
@@ -830,7 +830,7 @@ public class GSMPhone extends PhoneBase { 
        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());

        SharedPreferences.Editor editor = sp.edit();

        editor.putString(VM_SIM_IMSI, imsi);

        editor.commit();

        editor.apply();

    }



    public String getVoiceMailAlphaTag() {