diff options
| author | 2016-12-06 19:11:28 +0000 | |
|---|---|---|
| committer | 2016-12-06 19:11:28 +0000 | |
| commit | 70ae1bf4db205fd22608a3831233e4804f85e09c (patch) | |
| tree | bf89168638e34f5b680ab2b90be19db9f4b78d74 | |
| parent | 9600df035b9994ae481dd7ce0335241b752f7034 (diff) | |
| parent | 6a0c879de30e8e1a3ad23748a4ba9dde10bba75c (diff) | |
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 98c90bb21c19..cfb5a2caa98e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -35081,6 +35081,7 @@ package android.provider { 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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 326e9956696e..f8c120ad4ef2 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7450,6 +7450,15 @@ public final class Settings { @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. |