commit eb8bddb12cb603017e8b0f52e71b3bce80864465
author Edgar Wang <edgarwang@google.com> Fri Apr 19 17:29:49 2019 +0800
committer Edgar Wang <edgarwang@google.com> Mon Apr 22 22:18:32 2019 +0800
tree 0e906d624d9b0b701be0003aea7f04601b92cba0
parent d6bed5bcad47039578439bcb5e3ca2bdefb861e5

Set the default value for Secure Settings: AWARE_ENABLED

Bug: 130909059
Test: rebuild & manual test

Change-Id: I892c42953a86348786c3baedc5223d02be9f4578

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index a5b7849..3a45a6d 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3243,7 +3243,7 @@
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 177;
+            private static final int SETTINGS_VERSION = 178;
 
             private final int mUserId;
 
@@ -4369,6 +4369,25 @@
                     currentVersion = 177;
                 }
 
+                if (currentVersion == 177) {
+                    // Version 177: Set the default value for Secure Settings: AWARE_ENABLED
+
+                    final SettingsState secureSettings = getSecureSettingsLocked(userId);
+
+                    final Setting awareEnabled = secureSettings.getSettingLocked(
+                            Secure.AWARE_ENABLED);
+
+                    if (awareEnabled.isNull()) {
+                        final boolean defAwareEnabled = getContext().getResources().getBoolean(
+                                R.bool.def_aware_enabled);
+                        secureSettings.insertSettingLocked(
+                                Secure.AWARE_ENABLED, defAwareEnabled ? "1" : "0",
+                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+
+                    currentVersion = 178;
+                }
+
 
                 // vXXX: Add new settings above this point.