From 3efd531e2f610ed5e9a29fe945a5fffeb5d2b989 Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Mon, 6 Mar 2017 10:47:55 -0800 Subject: [PATCH] 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 --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- wifi/java/android/net/wifi/WifiManager.java | 18 ++++++++++++------ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index f64efbf2a4e5f..a49a3210d2b7f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/api/system-current.txt b/api/system-current.txt index b3eaebd6fc6e5..a9c03d125c3ae 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); diff --git a/api/test-current.txt b/api/test-current.txt index 7defb4c8775ad..e007e6eca1894 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index d4732ffe7365c..bbe96a70f823c 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -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(); }