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

Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev

Browse Source
This commit is contained in:
Jeremy Joslin
2016-03-03 16:49:27 +00:00
committed by Android Partner Code Review
parent 578a76e7de e9e6083ee1
commit 3f7314e331
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -21119,7 +21119,6 @@ package android.net.wifi {
method public boolean reconnect(); method public boolean reconnect();
method public boolean removeNetwork(int); method public boolean removeNetwork(int);
method public boolean saveConfiguration(); method public boolean saveConfiguration();
method public boolean setMetered(int, boolean);
method public void setTdlsEnabled(java.net.InetAddress, boolean); method public void setTdlsEnabled(java.net.InetAddress, boolean);
method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean); method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
method public boolean setWifiEnabled(boolean); method public boolean setWifiEnabled(boolean);

18
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -884,24 +884,6 @@ public class WifiManager {
} }
} }
/**
* Sets whether or not the given network is metered from a network policy
* point of view. A network should be classified as metered when the user is
* sensitive to heavy data usage on that connection due to monetary costs,
* data limitations or battery/performance issues. A typical example would
* be a wifi connection where the user was being charged for usage.
* @param netId the integer that identifies the network configuration
* to the supplicant.
* @param isMetered True to mark the network as metered.
* @return {@code true} if the operation succeeded.
* @hide
*/
@SystemApi
public boolean setMetered(int netId, boolean isMetered) {
// TODO(jjoslin): Implement
return false;
}
/** /**
* Remove the specified network from the list of configured networks. * Remove the specified network from the list of configured networks.
* This may result in the asynchronous delivery of state change * This may result in the asynchronous delivery of state change