commit eb0c68bf2b1042ce987deb5a3f0afb0203a580d4
author Michael Wright <michaelwr@google.com> Tue May 29 14:44:00 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 29 14:44:00 2018 -0700
tree 1210aab8510eba4dfc68fd9ee297e2a8d9a17649
parent 0736175903c00f0f196250c0147b6c1cce61d2c6
parent 6489d832e12db396e61e0436f6afcef0fad4921a

Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev am: eb2fdbb3c9
am: 6489d832e1

Change-Id: I3e54ce6ecb394ff591d25f31560a05b84acd8141

packages/SettingsProvider/res/values/defaults.xml

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 28e8db9..e1a602b 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -214,4 +214,7 @@
 
     <!-- Default for Settings.Global.BACKUP_AGENT_TIMEOUT_PARAMETERS -->
     <string name="def_backup_agent_timeout_parameters"></string>
+
+    <!-- Default for Settings.System.VIBRATE_WHEN_RINGING -->
+    <bool name="def_vibrate_when_ringing">false</bool>
 </resources>

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 fbe52d1..960d305 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2935,7 +2935,7 @@
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 168;
+            private static final int SETTINGS_VERSION = 169;
 
             private final int mUserId;
 
@@ -3805,6 +3805,21 @@
                     currentVersion = 168;
                 }
 
+                if (currentVersion == 168) {
+                    // Version 168: by default, vibrate for phone calls
+                    final SettingsState systemSettings = getSystemSettingsLocked(userId);
+                    final Setting currentSetting = systemSettings.getSettingLocked(
+                            Settings.System.VIBRATE_WHEN_RINGING);
+                    if (currentSetting.isNull()) {
+                        systemSettings.insertSettingLocked(
+                                Settings.System.VIBRATE_WHEN_RINGING,
+                                getContext().getResources().getBoolean(
+                                        R.bool.def_vibrate_when_ringing) ? "1" : "0",
+                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+                    currentVersion = 169;
+                }
+
                 // vXXX: Add new settings above this point.
 
                 if (currentVersion != newVersion) {