diff options
| author | 2019-01-03 22:20:36 +0000 | |
|---|---|---|
| committer | 2019-01-03 22:20:36 +0000 | |
| commit | 2e3f64a80b769c32adab81df7905393fc895059c (patch) | |
| tree | 210380211b97ec2e6d87ffe078302910e902784b | |
| parent | 3a745f9011c54482a70a0c70ca0fabc6f1fda4fd (diff) | |
| parent | ff9c587cc76ae1911d90bea5a03dd575f4f59e6d (diff) | |
Merge "Backup charging sounds enabled toggle correctly"
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 10 |
1 files 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 ce529a085e77..1727e75afe43 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( |