diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 672f88d813a04..977ac18df8ac1 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -222,4 +222,7 @@
 
     <!-- Default setting for ability to add users from the lock screen -->
     <bool name="def_add_users_from_lockscreen">false</bool>
+
+    <!--  default setting for Settings.System.END_BUTTON_BEHAVIOR : END_BUTTON_BEHAVIOR_SLEEP -->
+    <integer name="def_end_button_behavior">0x2</integer>
 </resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index afc524c369d00..3084b9bae5a11 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 @@ public class SettingsProvider extends ContentProvider {
         }
 
         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 @@ public class SettingsProvider extends ContentProvider {
                     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 "