Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Passpoint] Remove throws IllegalStateException form getUniqueId API

Browse Source 
Following up on feedback from API council:
Remove throws IllegalStateException form PasspointConfiguration#getUniqueId
API. No need to explicitly declare runtime exceptions.

Bug: 149758065
Test: PasspointConfigurationTest
Change-Id: I9022a7c87ef9839c6b60fdfd8394915779fa708b
This commit is contained in:
Hai Shalom
2020-02-18 14:48:30 -08:00
parent 481cfeaff1
commit efc940ff3f
3 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -31736,7 +31736,7 @@ package android.net.wifi.hotspot2 {
method public android.net.wifi.hotspot2.pps.Credential getCredential();
method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();
method public long getSubscriptionExpirationTimeMillis();
method @NonNull public String getUniqueId() throws java.lang.IllegalStateException;
method @NonNull public String getUniqueId();
method public boolean isOsuProvisioned();
method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);

9
wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java
View File

@@ -900,12 +900,15 @@ public final class PasspointConfiguration implements Parcelable {
}
/**
* Get a unique identifier for a PasspointConfiguration object.
* Get a unique identifier for a PasspointConfiguration object. The identifier depends on the
* configuration that identify the service provider under the HomeSp subtree, and on the
* credential configuration under the Credential subtree.
* The method throws an {@link IllegalStateException} if the configuration under HomeSp subtree
* or the configuration under Credential subtree are not initialized.
*
* @return A unique identifier
* @throws IllegalStateException if Credential or HomeSP nodes are not initialized
*/
public @NonNull String getUniqueId() throws IllegalStateException {
public @NonNull String getUniqueId() {
if (mCredential == null || mHomeSp == null || TextUtils.isEmpty(mHomeSp.getFqdn())) {
throw new IllegalStateException("Credential or HomeSP are not initialized");
}

20
wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java
View File

@@ -426,17 +426,11 @@ public class PasspointConfigurationTest {
*
* @throws Exception
*/
@Test
@Test (expected = IllegalStateException.class)
public void validateUniqueIdExceptionWithEmptyHomeSp() throws Exception {
PasspointConfiguration config = PasspointTestUtils.createConfig();
config.setHomeSp(null);
boolean exceptionCaught = false;
try {
String uniqueId = config.getUniqueId();
} catch (IllegalStateException e) {
exceptionCaught = true;
}
assertTrue(exceptionCaught);
String uniqueId = config.getUniqueId();
}
/**
@@ -445,16 +439,10 @@ public class PasspointConfigurationTest {
*
* @throws Exception
*/
@Test
@Test (expected = IllegalStateException.class)
public void validateUniqueIdExceptionWithEmptyCredential() throws Exception {
PasspointConfiguration config = PasspointTestUtils.createConfig();
config.setCredential(null);
boolean exceptionCaught = false;
try {
String uniqueId = config.getUniqueId();
} catch (IllegalStateException e) {
exceptionCaught = true;
}
assertTrue(exceptionCaught);
String uniqueId = config.getUniqueId();
}
}