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

Commit 3b6f1ed1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "passpoint: mark as @deprecated and add permissions"

parents 1c5d30b3 0ca45736

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -29913,7 +29913,7 @@ package android.net.wifi { 
    method public android.net.wifi.WifiInfo getConnectionInfo();

    method public android.net.DhcpInfo getDhcpInfo();

    method public int getMaxNumberOfNetworkSuggestionsPerApp();

    method public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();

    method public deprecated java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();

    method public java.util.List<android.net.wifi.ScanResult> getScanResults();

    method public int getWifiState();

    method public boolean is5GHzBandSupported();
@@ -29933,7 +29933,7 @@ package android.net.wifi { 
    method public deprecated boolean reconnect();

    method public deprecated boolean removeNetwork(int);

    method public int removeNetworkSuggestions(java.util.List<android.net.wifi.WifiNetworkSuggestion>);

    method public void removePasspointConfiguration(java.lang.String);

    method public deprecated void removePasspointConfiguration(java.lang.String);

    method public deprecated boolean saveConfiguration();

    method public void setTdlsEnabled(java.net.InetAddress, boolean);

    method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);

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

+12 −0
Original line number Diff line number Diff line
@@ -1727,7 +1727,13 @@ public class WifiManager { 
     * @param fqdn The FQDN of the Passpoint configuration to be removed

     * @throws IllegalArgumentException if no configuration is associated with the given FQDN.

     * @throws UnsupportedOperationException if Passpoint is not enabled on the device.

     * @deprecated This is no longer supported.

     */

    @Deprecated

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD

    })

    public void removePasspointConfiguration(String fqdn) {

        try {

            if (!mService.removePasspointConfiguration(fqdn, mContext.getOpPackageName())) {
@@ -1745,7 +1751,13 @@ public class WifiManager { 
     *

     * @return A list of {@link PasspointConfiguration}

     * @throws UnsupportedOperationException if Passpoint is not enabled on the device.

     * @deprecated This is no longer supported.

     */

    @Deprecated

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD

    })

    public List<PasspointConfiguration> getPasspointConfigurations() {

        try {

            return mService.getPasspointConfigurations();