From b0c36b235198d6d9a38bf13f39aa25359aac9b1a Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Thu, 28 Aug 2014 10:30:33 -0700 Subject: [PATCH] Actually remove settings Correct settings removal, which wasn't occurring during upgrades. Will followup with scrub of preference file references -- there are likely additional reasons this wasn't causing more crashes, i.e. certain settings not being ported over earlier versions. Bug: 16879376 Change-Id: I720a3181958a4201508726d0f6e06803c456f737 --- src/com/android/camera/settings/SettingsManager.java | 2 +- src/com/android/camera/settings/SettingsUpgrader.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/camera/settings/SettingsManager.java b/src/com/android/camera/settings/SettingsManager.java index a44693e4e..7141b67ea 100644 --- a/src/com/android/camera/settings/SettingsManager.java +++ b/src/com/android/camera/settings/SettingsManager.java @@ -502,6 +502,6 @@ public class SettingsManager { */ 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 2e6457db2..2b8b92465 100644 --- a/src/com/android/camera/settings/SettingsUpgrader.java +++ b/src/com/android/camera/settings/SettingsUpgrader.java @@ -80,7 +80,7 @@ public abstract class SettingsUpgrader { */ 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 @@ public abstract class SettingsUpgrader { */ protected int removeInteger(SharedPreferences oldPreferencesLocation, String key) { int value = oldPreferencesLocation.getInt(key, 0); - oldPreferencesLocation.edit().remove(key); + oldPreferencesLocation.edit().remove(key).apply(); return value; } -- 2.11.0