diff options
| author | 2016-12-20 22:24:13 +0000 | |
|---|---|---|
| committer | 2016-12-20 22:24:13 +0000 | |
| commit | f456ddf3fd38868c58638fd70060c48f9ab66879 (patch) | |
| tree | 6af5ab5af69266204ac5b4b0602b043df5115005 | |
| parent | 26e50963641189733f32362b8db39a3a6f1e19fd (diff) | |
| parent | d3dfd3b8e9ccafd0c3a524ab6ded717d4e6e5593 (diff) | |
Merge "Make WifiConfiguration#meteredHint a @SystemApi"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index d84a31eef935..f96a58b759a6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26855,6 +26855,7 @@ package android.net.wifi { field public boolean hiddenSSID; field public java.lang.String lastUpdateName; field public int lastUpdateUid; + field public boolean meteredHint; field public int networkId; field public int numAssociation; field public int numScorerOverride; diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 43e624667644..3b7f7216c147 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -701,6 +701,7 @@ public class WifiConfiguration implements Parcelable { * {@link com.android.server.wifi.WifiStateMachine}, or via a network score in * {@link com.android.server.wifi.ExternalScoreEvaluator}. */ + @SystemApi public boolean meteredHint; /** |