Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable wifi wake for all P devices."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-27 01:10:27 +00:00
committed by Android (Google) Code Review
parent de45fc4720 4f50ed4f1f
commit 92deeffdec
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/config.xml
View File

@@ -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.

15
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -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) {