From ff9c587cc76ae1911d90bea5a03dd575f4f59e6d Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 2 Jan 2019 15:44:00 -0500 Subject: [PATCH] Backup charging sounds enabled toggle correctly Previously deprecated global settings property was overriding the secure setting for charging_sounds_enabled. Only use the global setting if the secure setting is unset (null). Test: manual (repeat steps from bug) Change-Id: I0bceab765764662855a053c82cb7251a14d4a1d8 Fixes: 119761984 --- .../android/providers/settings/SettingsProvider.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index ce529a085e773..1727e75afe43d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -4125,10 +4125,12 @@ public class SettingsProvider extends ContentProvider { Secure.CHARGING_SOUNDS_ENABLED); if (!globalChargingSoundEnabled.isNull()) { - secureSettings.insertSettingLocked( - Secure.CHARGING_SOUNDS_ENABLED, - globalChargingSoundEnabled.getValue(), null, false, - SettingsState.SYSTEM_PACKAGE_NAME); + if (secureChargingSoundsEnabled.isNull()) { + secureSettings.insertSettingLocked( + Secure.CHARGING_SOUNDS_ENABLED, + globalChargingSoundEnabled.getValue(), null, false, + SettingsState.SYSTEM_PACKAGE_NAME); + } // set global charging_sounds_enabled setting to null since it's deprecated globalSettings.insertSettingLocked(