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

Merge "Flip flag to enable vibration on wireless charging" into pi-dev

Browse Source 
am: 65477d138d

Change-Id: Ieb817348628c020578ea7c8c7205b6e9f412e2ed
This commit is contained in:
Beverly
2018-05-24 14:12:44 -07:00
committed by android-build-merger
parent 2a4ce94354 65477d138d
commit 9b3ff51d87
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2935,7 +2935,7 @@ public class SettingsProvider extends ContentProvider {
} }
private final class UpgradeController { private final class UpgradeController {
private static final int SETTINGS_VERSION = 167; private static final int SETTINGS_VERSION = 168;
private final int mUserId; private final int mUserId;
@@ -3792,6 +3792,19 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 167; currentVersion = 167;
} }
if (currentVersion == 167) {
// Version 167: by default, vibrate for wireless charging
final SettingsState globalSettings = getGlobalSettingsLocked();
final Setting currentSetting = globalSettings.getSettingLocked(
Global.CHARGING_VIBRATION_ENABLED);
if (currentSetting.isNull()) {
globalSettings.insertSettingLocked(
Global.CHARGING_VIBRATION_ENABLED, "1",
null, true, SettingsState.SYSTEM_PACKAGE_NAME);
}
currentVersion = 168;
}
// vXXX: Add new settings above this point. // vXXX: Add new settings above this point.
if (currentVersion != newVersion) { if (currentVersion != newVersion) {