Merge "Make WifiConfiguration#meteredHint a @SystemApi"

2016-12-20 22:24:13 +00:00
parent 26e5096364 d3dfd3b8e9
commit f456ddf3fd
2 changed files with 2 additions and 0 deletions
--- 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;
--- 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;

    /**