From 16df2ceeb72059e207e01a0529a22ab4f4814f4c Mon Sep 17 00:00:00 2001
From: Antonino Faraone <afaraone@google.com>
Date: Mon, 28 Aug 2023 14:58:50 +0000
Subject: Add a configurable default value for WIFI_ALWAYS_REQUESTED

Bug: 294156275
Test: Manual
Change-Id: I876afd543b7bb6c38e686e54657674f23761712a
---
 packages/SettingsProvider/res/values/defaults.xml     |  3 +++
 .../android/providers/settings/SettingsProvider.java  | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index fe51ed5ace32..4c9436b4e151 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -324,4 +324,7 @@
 
     <!-- Whether predictive back animation is enabled by default. -->
     <bool name="def_enable_back_animation">false</bool>
+
+    <!-- Whether wifi is always requested by default. -->
+    <bool name="def_enable_wifi_always_requested">false</bool>
 </resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index c0d16712b255..40f7ba667376 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3876,7 +3876,7 @@ public class SettingsProvider extends ContentProvider {
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 221;
+            private static final int SETTINGS_VERSION = 222;
 
             private final int mUserId;
 
@@ -5985,6 +5985,23 @@ public class SettingsProvider extends ContentProvider {
                     currentVersion = 221;
                 }
 
+                if (currentVersion == 221) {
+                    // Version 221: Set a default value for wifi always requested
+                    final SettingsState globalSettings = getGlobalSettingsLocked();
+                    final Setting enableWifiAlwaysRequested =
+                            globalSettings.getSettingLocked(Global.WIFI_ALWAYS_REQUESTED);
+                    if (enableWifiAlwaysRequested.isNull()) {
+                        final boolean defEnableWifiAlwaysRequested =
+                                getContext()
+                                        .getResources()
+                                        .getBoolean(R.bool.def_enable_wifi_always_requested);
+                        initGlobalSettingsDefaultValLocked(
+                                Settings.Global.WIFI_ALWAYS_REQUESTED,
+                                defEnableWifiAlwaysRequested);
+                    }
+                    currentVersion = 222;
+                }
+
                 // vXXX: Add new settings above this point.
 
                 if (currentVersion != newVersion) {
-- 
cgit v1.2.3-59-g8ed1b