diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-10-03 00:17:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-03 00:17:16 +0000 |
| commit | 6831bda5bfc59929227e18512291c2dd70207aef (patch) | |
| tree | 9c8d8fe1d7b79903d53f3b4db10806f9e30b0086 | |
| parent | 4b35b6d128fb7ab9d2d5142ae1ab8faea2c57683 (diff) | |
| parent | 47138f52c06806229fcb351bec3c9873b035a15c (diff) | |
Merge "[PASSPOINT] Lint issues + naming (3gpp -> 3GPP)"
| -rw-r--r-- | service/java/com/android/server/wifi/hotspot2/PasspointProvider.java | 9 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java b/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java index 1ae41cca7..6d09a29ca 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java @@ -259,12 +259,12 @@ public class PasspointProvider { */ public PasspointMatch match(Map<ANQPElementType, ANQPElement> anqpElements, RoamingConsortium roamingConsortium) { - PasspointMatch providerMatch = matchProviderExceptFor3Gpp(anqpElements, roamingConsortium); + PasspointMatch providerMatch = matchProviderExceptFor3GPP(anqpElements, roamingConsortium); // 3GPP Network matching. if (providerMatch == PasspointMatch.None && ANQPMatcher.matchThreeGPPNetwork( - (ThreeGPPNetworkElement) anqpElements.get(ANQPElementType.ANQP3GPPNetwork), - mImsiParameter, mMatchingSIMImsiList)) { + (ThreeGPPNetworkElement) anqpElements.get(ANQPElementType.ANQP3GPPNetwork), + mImsiParameter, mMatchingSIMImsiList)) { return PasspointMatch.RoamingProvider; } @@ -468,7 +468,8 @@ public class PasspointProvider { * @param roamingConsortium Roaming Consortium information element from the AP * @return {@link PasspointMatch} */ - private PasspointMatch matchProviderExceptFor3Gpp(Map<ANQPElementType, ANQPElement> anqpElements, + private PasspointMatch matchProviderExceptFor3GPP( + Map<ANQPElementType, ANQPElement> anqpElements, RoamingConsortium roamingConsortium) { // Domain name matching. if (ANQPMatcher.matchDomainName( diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java index 36cb88307..58496622f 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java @@ -47,8 +47,8 @@ import com.android.server.wifi.hotspot2.anqp.ThreeGPPNetworkElement; import com.android.server.wifi.hotspot2.anqp.eap.AuthParam; import com.android.server.wifi.hotspot2.anqp.eap.EAPMethod; import com.android.server.wifi.hotspot2.anqp.eap.NonEAPInnerAuth; - import com.android.server.wifi.util.InformationElementUtil.RoamingConsortium; + import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -795,7 +795,7 @@ public class PasspointProviderTest { // Setup NAI Realm ANQP element with different realm. anqpElementMap.put(ANQPElementType.ANQPNAIRealm, - createNAIRealmElement(testRealm, EAPConstants.EAP_TTLS, + createNAIRealmElement(testRealm, EAPConstants.EAP_TTLS, new NonEAPInnerAuth(NonEAPInnerAuth.AUTH_TYPE_MSCHAPV2))); assertEquals(PasspointMatch.RoamingProvider, |