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

Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."

Browse Source 
am: 70ae1bf4db

Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
This commit is contained in:
Stephen Chen
2016-12-06 19:20:24 +00:00
committed by android-build-merger
parent f120cf3d88 70ae1bf4db
commit 45fdf32038
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -35237,6 +35237,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";

9
core/java/android/provider/Settings.java
View File

@@ -7651,6 +7651,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.