commit da904810f313b1c23635f31533b7d94ced47ba34
author Beverly <beverlyt@google.com> Fri Mar 02 09:55:30 2018 -0500
committer Beverly <beverlyt@google.com> Tue Mar 06 10:07:15 2018 -0500
tree 04fa59dbae40386a619f60d395626ca45764b913
parent 2cf621f8faee17dbb034d379d45f3f0925bbf11b

Update default charging sound to new sound

Test: manual (unmute phone, start charging and hear sound)
Change-Id: I5db9245660d3875f74f9a58073856c51d2c86b5e
Fixes: 73362089

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index bbb4fc8..a317e3e 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3028,7 +3028,7 @@
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 155;
+            private static final int SETTINGS_VERSION = 156;
 
             private final int mUserId;
 
@@ -3673,6 +3673,28 @@
                     currentVersion = 155;
                 }
 
+                if (currentVersion == 155) {
+                    // Version 155: Set the default value for CHARGING_STARTED_SOUND.
+                    final SettingsState globalSettings = getGlobalSettingsLocked();
+                    final String oldValue = globalSettings.getSettingLocked(
+                            Global.CHARGING_STARTED_SOUND).getValue();
+                    final String oldDefault = getContext().getResources().getString(
+                            R.string.def_wireless_charging_started_sound);
+                    if (TextUtils.equals(null, oldValue)
+                            || TextUtils.equals(oldValue, oldDefault)) {
+                        final String defaultValue = getContext().getResources().getString(
+                                R.string.def_charging_started_sound);
+                        if (!TextUtils.isEmpty(defaultValue)) {
+                            globalSettings.insertSettingLocked(
+                                    Settings.Global.CHARGING_STARTED_SOUND, defaultValue,
+                                    null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                        }
+
+                    }
+                    currentVersion = 156;
+                }
+
+
                 // vXXX: Add new settings above this point.
 
                 if (currentVersion != newVersion) {