Merge "Actually remove settings" into ub-camera-glacier
diff --git a/src/com/android/camera/settings/SettingsManager.java b/src/com/android/camera/settings/SettingsManager.java
index a44693e..7141b67 100644
--- a/src/com/android/camera/settings/SettingsManager.java
+++ b/src/com/android/camera/settings/SettingsManager.java
@@ -502,6 +502,6 @@
*/
public void remove(String scope, String key) {
SharedPreferences preferences = getPreferencesFromScope(scope);
- preferences.edit().remove(key);
+ preferences.edit().remove(key).apply();
}
}
diff --git a/src/com/android/camera/settings/SettingsUpgrader.java b/src/com/android/camera/settings/SettingsUpgrader.java
index 2e6457d..2b8b924 100644
--- a/src/com/android/camera/settings/SettingsUpgrader.java
+++ b/src/com/android/camera/settings/SettingsUpgrader.java
@@ -80,7 +80,7 @@
*/
protected boolean removeBoolean(SharedPreferences oldPreferencesLocation, String key) {
boolean value = oldPreferencesLocation.getBoolean(key, false);
- oldPreferencesLocation.edit().remove(key);
+ oldPreferencesLocation.edit().remove(key).apply();
return value;
}
@@ -94,7 +94,7 @@
*/
protected int removeInteger(SharedPreferences oldPreferencesLocation, String key) {
int value = oldPreferencesLocation.getInt(key, 0);
- oldPreferencesLocation.edit().remove(key);
+ oldPreferencesLocation.edit().remove(key).apply();
return value;
}