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

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

Merge "Passpoint: add NETWORK_CARRIER_PROVISIONING for removePasspointConfigurations"

parents 23e4c3a8 ce5f7f87

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29812,7 +29812,7 @@ package android.net.wifi { 
    method @Deprecated public boolean reconnect();

    method @Deprecated public boolean removeNetwork(int);

    method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int removeNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>);

    method @Deprecated @RequiresPermission("android.permission.NETWORK_SETTINGS") public void removePasspointConfiguration(String);

    method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", "android.permission.NETWORK_CARRIER_PROVISIONING"}) public void removePasspointConfiguration(String);

    method @Deprecated public boolean saveConfiguration();

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

    method public void setTdlsEnabledWithMacAddress(String, boolean);

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

+4 −1
Original line number Diff line number Diff line
@@ -1752,7 +1752,10 @@ public class WifiManager { 
     * @deprecated This is no longer supported.

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_CARRIER_PROVISIONING

    })

    public void removePasspointConfiguration(String fqdn) {

        try {

            if (!mService.removePasspointConfiguration(fqdn, mContext.getOpPackageName())) {