diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java
index 5b7a47c..1fbfdaa 100644
--- a/src/com/android/camera/ComboPreferences.java
+++ b/src/com/android/camera/ComboPreferences.java
@@ -143,7 +143,8 @@
         }
 
         public void apply() {
-            commit();
+            mEditorGlobal.apply();
+            mEditorLocal.apply();
         }
 
         // Note: clear() and remove() affects both local and global preferences.
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index d84cc61..6b1bffa 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -108,7 +108,7 @@
     protected void persistStringValue(String value) {
         SharedPreferences.Editor editor = getSharedPreferences().edit();
         editor.putString(mKey, value);
-        editor.commit();
+        editor.apply();
     }
 
     @Override