From 4f50ed4f1f4d2536a7c2185166ddb911c9afa808 Mon Sep 17 00:00:00 2001
From: Joe LaPenna <jlapenna@google.com>
Date: Mon, 22 Jan 2018 14:54:45 -0800
Subject: [PATCH] Enable wifi wake for all P devices.

Test: manual: flash O, set wifi_wakeup_available to 0, flash current
build, ensure wifi_wakeup_available is 1
Bug: 69624403
Change-Id: Ia535ce690cebd4b0c5d6f772c5a627a79a430284
---
 core/res/res/values/config.xml                    |  2 +-
 .../providers/settings/SettingsProvider.java      | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 66e56bf55a517..903f6d62c1c97 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -436,7 +436,7 @@
           0 = Not available.
           1 = Available.
      -->
-    <integer translatable="false" name="config_wifi_wakeup_available">0</integer>
+    <integer translatable="false" name="config_wifi_wakeup_available">1</integer>
 
     <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering.
 
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index b7d6da439faff..d1459bba90c13 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3015,7 +3015,7 @@ public class SettingsProvider extends ContentProvider {
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 151;
+            private static final int SETTINGS_VERSION = 152;
 
             private final int mUserId;
 
@@ -3620,6 +3620,19 @@ public class SettingsProvider extends ContentProvider {
                     currentVersion = 151;
                 }
 
+                if (currentVersion == 151) {
+                    // Version 152: Reset wifi wake available for upgrading users
+                    final SettingsState globalSettings = getGlobalSettingsLocked();
+                    final int defaultValue = getContext().getResources().getInteger(
+                            com.android.internal.R.integer.config_wifi_wakeup_available);
+                    globalSettings.insertSettingLocked(
+                            Settings.Global.WIFI_WAKEUP_AVAILABLE,
+                            String.valueOf(defaultValue),
+                            null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+
+                    currentVersion = 152;
+                }
+
                 // vXXX: Add new settings above this point.
 
                 if (currentVersion != newVersion) {