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

Commit 6ef18c7d authored by David Su's avatar David Su
Browse files

Add @Nullable/@NonNull to WifiManager APIs 

Add @Nullable/@NonNull to WifiManager APIs

Bug: 126702500
Test: ./frameworks/base/wifi/tests/runtests.sh
Change-Id: Ied04a936ca50880376072801848fd3096b87d099
parent e4e42224

api/system-current.txt

+5 −5
Original line number Original line Diff line number Diff line
@@ -4723,10 +4723,10 @@ package android.net.wifi { 
















  public class WifiManager {







  public class WifiManager {











    method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void addWifiUsabilityStatsListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiUsabilityStatsListener);







    method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void addWifiUsabilityStatsListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiUsabilityStatsListener);











    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void connect(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener);







    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void connect(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener);











    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void connect(int, android.net.wifi.WifiManager.ActionListener);







    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void connect(int, @Nullable android.net.wifi.WifiManager.ActionListener);











    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void disable(int, android.net.wifi.WifiManager.ActionListener);







    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void disable(int, @Nullable android.net.wifi.WifiManager.ActionListener);











    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void forget(int, android.net.wifi.WifiManager.ActionListener);







    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener);











    method @NonNull @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);







    method @NonNull @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);











    method @NonNull @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(java.util.List<android.net.wifi.ScanResult>);







    method @NonNull @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(java.util.List<android.net.wifi.ScanResult>);











    method @NonNull @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,android.net.wifi.hotspot2.PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(@NonNull java.util.Set<android.net.wifi.hotspot2.OsuProvider>);







    method @NonNull @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,android.net.wifi.hotspot2.PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(@NonNull java.util.Set<android.net.wifi.hotspot2.OsuProvider>);









@@ -4738,7 +4738,7 @@ package android.net.wifi {









    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();







    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();











    method public boolean isWifiScannerSupported();







    method public boolean isWifiScannerSupported();











    method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void removeWifiUsabilityStatsListener(@NonNull android.net.wifi.WifiManager.WifiUsabilityStatsListener);







    method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void removeWifiUsabilityStatsListener(@NonNull android.net.wifi.WifiManager.WifiUsabilityStatsListener);











    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void save(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener);







    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void save(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener);











    method @RequiresPermission("android.permission.WIFI_SET_DEVICE_MOBILITY_STATE") public void setDeviceMobilityState(int);







    method @RequiresPermission("android.permission.WIFI_SET_DEVICE_MOBILITY_STATE") public void setDeviceMobilityState(int);











    method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);







    method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);











    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsConfiguratorInitiator(@NonNull String, int, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);







    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsConfiguratorInitiator(@NonNull String, int, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);

































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



+5
−5




























Original line number
Original line
Diff line number
Diff line








@@ -3604,7 +3604,7 @@ public class WifiManager {









            android.Manifest.permission.NETWORK_SETUP_WIZARD,







            android.Manifest.permission.NETWORK_SETUP_WIZARD,











            android.Manifest.permission.NETWORK_STACK







            android.Manifest.permission.NETWORK_STACK











    })







    })











    public void connect(WifiConfiguration config, ActionListener listener) {







    public void connect(@NonNull WifiConfiguration config, @Nullable ActionListener listener) {











        if (config == null) throw new IllegalArgumentException("config cannot be null");







        if (config == null) throw new IllegalArgumentException("config cannot be null");











        // Use INVALID_NETWORK_ID for arg1 when passing a config object







        // Use INVALID_NETWORK_ID for arg1 when passing a config object











        // arg1 is used to pass network id when the network already exists







        // arg1 is used to pass network id when the network already exists









@@ -3630,7 +3630,7 @@ public class WifiManager {









            android.Manifest.permission.NETWORK_SETUP_WIZARD,







            android.Manifest.permission.NETWORK_SETUP_WIZARD,











            android.Manifest.permission.NETWORK_STACK







            android.Manifest.permission.NETWORK_STACK











    })







    })











    public void connect(int networkId, ActionListener listener) {







    public void connect(int networkId, @Nullable ActionListener listener) {











        if (networkId < 0) throw new IllegalArgumentException("Network id cannot be negative");







        if (networkId < 0) throw new IllegalArgumentException("Network id cannot be negative");











        getChannel().sendMessage(CONNECT_NETWORK, networkId, putListener(listener));







        getChannel().sendMessage(CONNECT_NETWORK, networkId, putListener(listener));











    }







    }










@@ -3661,7 +3661,7 @@ public class WifiManager {









            android.Manifest.permission.NETWORK_SETUP_WIZARD,







            android.Manifest.permission.NETWORK_SETUP_WIZARD,











            android.Manifest.permission.NETWORK_STACK







            android.Manifest.permission.NETWORK_STACK











    })







    })











    public void save(WifiConfiguration config, ActionListener listener) {







    public void save(@NonNull WifiConfiguration config, @Nullable ActionListener listener) {











        if (config == null) throw new IllegalArgumentException("config cannot be null");







        if (config == null) throw new IllegalArgumentException("config cannot be null");











        getChannel().sendMessage(SAVE_NETWORK, 0, putListener(listener), config);







        getChannel().sendMessage(SAVE_NETWORK, 0, putListener(listener), config);











    }







    }









@@ -3685,7 +3685,7 @@ public class WifiManager {









            android.Manifest.permission.NETWORK_SETUP_WIZARD,







            android.Manifest.permission.NETWORK_SETUP_WIZARD,











            android.Manifest.permission.NETWORK_STACK







            android.Manifest.permission.NETWORK_STACK











    })







    })











    public void forget(int netId, ActionListener listener) {







    public void forget(int netId, @Nullable ActionListener listener) {











        if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");







        if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");











        getChannel().sendMessage(FORGET_NETWORK, netId, putListener(listener));







        getChannel().sendMessage(FORGET_NETWORK, netId, putListener(listener));











    }







    }









@@ -3705,7 +3705,7 @@ public class WifiManager {









            android.Manifest.permission.NETWORK_SETUP_WIZARD,







            android.Manifest.permission.NETWORK_SETUP_WIZARD,











            android.Manifest.permission.NETWORK_STACK







            android.Manifest.permission.NETWORK_STACK











    })







    })











    public void disable(int netId, ActionListener listener) {







    public void disable(int netId, @Nullable ActionListener listener) {











        if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");







        if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");











        getChannel().sendMessage(DISABLE_NETWORK, netId, putListener(listener));







        getChannel().sendMessage(DISABLE_NETWORK, netId, putListener(listener));











    }







    }