commit 09da25f00d0d8cd6625b6ba6f184d4a182b04e7f
author Beverly <beverlyt@google.com> Mon Feb 26 09:17:07 2018 -0500
committer Beverly <beverlyt@google.com> Wed Mar 07 13:57:59 2018 -0500
tree d3084743aec878a92c0d6cec3d9b2d789dafc1a1
parent 20ebb0a6d8e7a0d4c0c634fd5b88aeaa97247706

Using zen duration preference

Test: make ROBOTEST_FILTER=ZenDurationDialogTest RunSettingsLibRoboTests -j40
Bug: 73741459
Change-Id: Ide76ac8016b84f128c47ad3731eeced25dce8c73

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 baf17cb..6398858 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2938,7 +2938,7 @@
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 156;
+            private static final int SETTINGS_VERSION = 157;
 
             private final int mUserId;
 
@@ -3604,7 +3604,21 @@
                     currentVersion = 156;
                 }
 
+                if (currentVersion == 156) {
+                    // Version 156: Set a default value for zen duration
+                    final SettingsState globalSettings = getGlobalSettingsLocked();
+                    final Setting currentSetting = globalSettings.getSettingLocked(
+                            Global.ZEN_DURATION);
+                    if (currentSetting.isNull()) {
+                        String defaultZenDuration = Integer.toString(getContext()
+                                .getResources().getInteger(R.integer.def_zen_duration));
+                        globalSettings.insertSettingLocked(
+                                Global.ZEN_DURATION, defaultZenDuration,
+                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
 
+                    currentVersion = 157;
+                }
                 // vXXX: Add new settings above this point.
 
                 if (currentVersion != newVersion) {