commit 70889ff69fe6af3dd51d67bea6dcf4ef940df546
author Stephen Chen <stewchen@google.com> Tue Dec 06 19:34:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 06 19:34:46 2016 +0000
tree f547d0e1375ee907996f330b385400ed6d1362c0
parent 416427e82080d4652e0292b29117710de8bc409b
parent e70ef235fbe4f38ab2c76da45027b16fe4635210

Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038
am: e70ef235fb

Change-Id: I46186245e038597018f66e44459d724456e8f993

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 3347560..49db98b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -35237,6 +35237,7 @@
     field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
     field public static final java.lang.String MODE_RINGER = "mode_ringer";
     field public static final java.lang.String NETWORK_PREFERENCE = "network_preference";
+    field public static final java.lang.String NETWORK_RECOMMENDATIONS_ENABLED = "network_recommendations_enabled";
     field public static final java.lang.String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";
     field public static final java.lang.String RADIO_BLUETOOTH = "bluetooth";
     field public static final java.lang.String RADIO_CELL = "cell";

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 1294c50..d9a851c 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7657,6 +7657,15 @@
         @SystemApi
         public static final String WIFI_WAKEUP_ENABLED = "wifi_wakeup_enabled";
 
+        /**
+         * Value to specify if network recommendations from
+         * {@link com.android.server.NetworkScoreService} are enabled.
+         * @hide
+         */
+        @SystemApi
+        public static final String NETWORK_RECOMMENDATIONS_ENABLED =
+                "network_recommendations_enabled";
+
        /**
         * Settings to allow BLE scans to be enabled even when Bluetooth is turned off for
         * connectivity.