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

Commit 3efd531e authored by Peter Qiu's avatar Peter Qiu
Browse files

hotspot2: update Passpoint configuration management APIs 

Address API Councils comment to update both
WifiManager#addOrUpdatePasspointConfiguration and
WifiManager#removePasspointConfiguration to return void and throw
exception on failure instead of returning a boolean.

Bug: 35858311,35856174
Test: make -j32
Change-Id: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
Merged-In: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
parent b5ca6f36

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -25025,7 +25025,7 @@ package android.net.wifi { 














  public class WifiManager {















    method public int addNetwork(android.net.wifi.WifiConfiguration);













    method public boolean addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);













    method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);















    method public static int calculateSignalLevel(int, int);















    method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);















    method public static int compareSignalLevel(int, int);










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













    method public boolean reassociate();















    method public boolean reconnect();















    method public boolean removeNetwork(int);













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













    method public 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);

























api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








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



























  public class WifiManager {















    method public int addNetwork(android.net.wifi.WifiConfiguration);













    method public boolean addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);













    method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);















    method public static int calculateSignalLevel(int, int);















    method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);















    method public static int compareSignalLevel(int, int);










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













    method public boolean reassociate();















    method public boolean reconnect();















    method public boolean removeNetwork(int);













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













    method public 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);

























api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








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



























  public class WifiManager {















    method public int addNetwork(android.net.wifi.WifiConfiguration);













    method public boolean addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);













    method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);















    method public static int calculateSignalLevel(int, int);















    method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);















    method public static int compareSignalLevel(int, int);










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













    method public boolean reassociate();















    method public boolean reconnect();















    method public boolean removeNetwork(int);













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













    method public 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
−6




























Original line number
Diff line number
Diff line








@@ -924,12 +924,15 @@ public class WifiManager {













     * Name).  In the case when there is an existing configuration with the same















     * FQDN, the new configuration will replace the existing configuration.















     *













     * An {@link IllegalArgumentException} will be thrown on failure.













     *















     * @param config The Passpoint configuration to be added













     * @return true on success















     */













    public boolean addOrUpdatePasspointConfiguration(PasspointConfiguration config) {













    public void addOrUpdatePasspointConfiguration(PasspointConfiguration config) {















        try {













            return mService.addOrUpdatePasspointConfiguration(config);













            if (!mService.addOrUpdatePasspointConfiguration(config)) {













                throw new IllegalArgumentException();













            }















        } catch (RemoteException e) {















            throw e.rethrowFromSystemServer();















        }









@@ -938,12 +941,15 @@ public class WifiManager {













    /**















     * Remove the Passpoint configuration identified by its FQDN (Fully Qualified Domain Name).















     *













     * An {@link IllegalArgumentException} will be thrown on failure.













     *















     * @param fqdn The FQDN of the passpoint configuration to be removed













     * @return true on success















     */













    public boolean removePasspointConfiguration(String fqdn) {













    public void removePasspointConfiguration(String fqdn) {















        try {













            return mService.removePasspointConfiguration(fqdn);













            if (!mService.removePasspointConfiguration(fqdn)) {













                throw new IllegalArgumentException();













            }















        } catch (RemoteException e) {















            throw e.rethrowFromSystemServer();















        }