commit 38e184a078458318007fb57a8637428c287c0195
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Feb 12 02:06:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 12 02:06:05 2019 +0000
tree 96e3bcb55fb3fa59df1df27383b6659163e955f0
parent 8c04b9f4b9fa79a15af770b0f1ad2a4d00c087da
parent 0f167a214aca5fd02b42a8efaa7e14468598ae3e

Merge "Merge "Convert Android.mk file to Android.bp" am: 190ff7457c am: 4bb2c54698 am: 8d838a3ced"

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 3747ec6..22329ba 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -13343,6 +13343,14 @@
         public static final String ISOLATED_STORAGE_REMOTE = "isolated_storage_remote";
 
         /**
+         * Indicates whether aware is available in the current location.
+         * @hide
+         */
+        public static final String AWARE_ALLOWED = "aware_allowed";
+
+        private static final Validator AWARE_ALLOWED_VALIDATOR = BOOLEAN_VALIDATOR;
+
+        /**
          * Settings to backup. This is here so that it's in the same place as the settings
          * keys and easy to update.
          *
@@ -13388,6 +13396,7 @@
             SOFT_AP_TIMEOUT_ENABLED,
             ZEN_DURATION,
             CHARGING_VIBRATION_ENABLED,
+            AWARE_ALLOWED,
         };
 
         /**
@@ -13448,6 +13457,7 @@
             VALIDATORS.put(WIFI_PNO_RECENCY_SORTING_ENABLED,
                     WIFI_PNO_RECENCY_SORTING_ENABLED_VALIDATOR);
             VALIDATORS.put(WIFI_LINK_PROBING_ENABLED, WIFI_LINK_PROBING_ENABLED_VALIDATOR);
+            VALIDATORS.put(AWARE_ALLOWED, AWARE_ALLOWED_VALIDATOR);
         }
 
         /**