diff options
| author | 2017-01-21 05:38:45 +0000 | |
|---|---|---|
| committer | 2017-01-21 05:38:45 +0000 | |
| commit | 17a040d48e4879a7f1304ff01e631710f8f24184 (patch) | |
| tree | 76a198926b22502caa8d0f7a48715685b357d572 | |
| parent | 9bd62dee06d49131742ca83d9882d6183e3c4691 (diff) | |
| parent | 835db7f6b62b8417b0facbe018c8fe610ef4acd4 (diff) | |
Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c
am: 835db7f6b6
Change-Id: I5a8e3a4fc0198dbb7bf88e2bbcf0152b0b82a7fc
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 70651db07cb8..1fcdf800178a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -35487,6 +35487,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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index eb04e54bbb30..896dcb124e41 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7696,6 +7696,16 @@ public final class Settings { "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. * |