commit ec7a118950543dfa89cb2c85cc1c79443d93e200
author Keun-young Park <keunyoung@google.com> Tue Oct 18 11:52:38 2016 -0700
committer Keun-young Park <keunyoung@google.com> Wed Oct 19 18:54:19 2016 -0700
tree afd873ddc1eb20c428550c4f548072a8ab1b17b4
parent db20fb1fbb862924429d571a879391b241b0f804

add default overlay for END_CALL_BEHAVIOR

- for automotive, default END_CALL_BEHAVIOR should be 0.
- automotive product should have overlay overriding it.
- default value is the same as now

bug: 31926624
Test: manual (check dumpsys window policy)
Change-Id: Ice7b3c1374dfccf8a03c13c73201fa1615acab5f

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 afc524c..3084b9b 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2137,7 +2137,7 @@
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 132;
+            private static final int SETTINGS_VERSION = 133;
 
             private final int mUserId;
 
@@ -2479,6 +2479,19 @@
                     currentVersion = 132;
                 }
 
+                if (currentVersion == 132) {
+                    // Version 132: Add default end button behavior
+                    final SettingsState systemSettings = getSystemSettingsLocked(userId);
+                    if (systemSettings.getSettingLocked(Settings.System.END_BUTTON_BEHAVIOR) ==
+                            null) {
+                        String defaultEndButtonBehavior = Integer.toString(getContext()
+                                .getResources().getInteger(R.integer.def_end_button_behavior));
+                        systemSettings.insertSettingLocked(Settings.System.END_BUTTON_BEHAVIOR,
+                                defaultEndButtonBehavior, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+                    currentVersion = 133;
+                }
+
                 if (currentVersion != newVersion) {
                     Slog.wtf("SettingsProvider", "warning: upgrading settings database to version "
                             + newVersion + " left it at "