Merge "Add Setting for curating saved open networks."

am: b3b665de22

Change-Id: I3c65f39dc4f38f1c6c00a240f519cb0b0cf1a916
This commit is contained in:
Amin Shaikh
2017-01-21 05:27:06 +00:00
committed by android-build-merger
2 changed files with 11 additions and 0 deletions

View File

@@ -35483,6 +35483,7 @@ package android.provider {
field public static final java.lang.String BOOT_COUNT = "boot_count";
field public static final java.lang.String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled";
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String CURATE_SAVED_OPEN_NETWORKS = "curate_saved_open_networks";
field public static final java.lang.String DATA_ROAMING = "data_roaming";
field public static final java.lang.String DEBUG_APP = "debug_app";
field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";

View File

@@ -7665,6 +7665,16 @@ public final class Settings {
public static final String NETWORK_RECOMMENDATIONS_ENABLED =
"network_recommendations_enabled";
/**
* Value to specify if the Wi-Fi Framework should defer to
* {@link com.android.server.NetworkScoreService} for evaluating saved open networks.
*
* Type: int (0 for false, 1 for true)
* @hide
*/
@SystemApi
public static final String CURATE_SAVED_OPEN_NETWORKS = "curate_saved_open_networks";
/**
* The number of milliseconds the {@link com.android.server.NetworkScoreService}
* will give a recommendation request to complete before returning a default response.