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

Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5

Browse Source 
am: 9209505c85

Change-Id: I4584fa5909f60fa21dec2014c90b3d7dc49a13a9
This commit is contained in:
Amin Shaikh
2016-12-20 22:48:15 +00:00
committed by android-build-merger
parent a6b0ad5821 9209505c85
commit 6a7dbcb63c
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -26851,6 +26851,7 @@ package android.net.wifi {
field public boolean hiddenSSID; field public boolean hiddenSSID;
field public java.lang.String lastUpdateName; field public java.lang.String lastUpdateName;
field public int lastUpdateUid; field public int lastUpdateUid;
field public boolean meteredHint;
field public int networkId; field public int networkId;
field public int numAssociation; field public int numAssociation;
field public int numScorerOverride; field public int numScorerOverride;

1
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -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.WifiStateMachine}, or via a network score in
* {@link com.android.server.wifi.ExternalScoreEvaluator}. * {@link com.android.server.wifi.ExternalScoreEvaluator}.
*/ */
@SystemApi
public boolean meteredHint; public boolean meteredHint;
/** /**