From e9e6083ee19b7474d853b4b8c3e4b4fbcba30855 Mon Sep 17 00:00:00 2001 From: Jeremy Joslin Date: Wed, 2 Mar 2016 22:16:27 +0000 Subject: [PATCH] Revert "New systemapi to mark a wifi network as metered." This reverts commit 7a598d3d800fc47b7c2f9300411edc0ef06da493. Change-Id: Ib6b9081ee4ded7582fb90d7a9066de95ab221f61 --- api/system-current.txt | 1 - wifi/java/android/net/wifi/WifiManager.java | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index fc9ae9bf8848d..ca92c45ebd9ed 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -21106,7 +21106,6 @@ package android.net.wifi { method public boolean reconnect(); method public boolean removeNetwork(int); method public boolean saveConfiguration(); - method public boolean setMetered(int, boolean); method public void setTdlsEnabled(java.net.InetAddress, boolean); method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean); method public boolean setWifiEnabled(boolean); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 0a859a15b3f6f..4133cda9fe01b 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -883,24 +883,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. * This may result in the asynchronous delivery of state change