Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

Browse Source 
Merge commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28'

* commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28':
  More SharedPreferences commit() -> apply() changes.
This commit is contained in:
Brad Fitzpatrick
2010-09-03 13:27:51 -07:00
committed by Android Git Automerger
parent 5410a60261 9eb32c96c8
commit 4f3c5589c8
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/preference/PreferenceManager.java
View File

@@ -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;

2
telephony/java/com/android/internal/telephony/PhoneBase.java
View File

@@ -285,7 +285,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();
}
/**

2
telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
View File

@@ -1406,7 +1406,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();
}
/**

2
telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
View File

@@ -129,7 +129,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) ||

4
telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
View File

@@ -809,7 +809,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());
}
@@ -832,7 +832,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() {