Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42ed2d06 authored by Jeremy Joslin's avatar Jeremy Joslin Committed by android-build-merger
Browse files

Merge "Revert "New systemapi to mark a wifi network as metered."" into... 

Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev am: 3f7314e3
am: b94df9db

* commit 'b94df9db':
  Revert "New systemapi to mark a wifi network as metered."
parents 03b81e80 b94df9db

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -26663,7 +26663,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 setWifiApConfiguration(android.net.wifi.WifiConfiguration);

    method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);

wifi/java/android/net/wifi/WifiManager.java

+0 −18
Original line number Original line Diff line number Diff line
@@ -888,24 +888,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