From 8dee619860d7d0e9caf2ed9f200daea73aa78824 Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Wed, 8 Feb 2017 10:39:21 -0800 Subject: [PATCH] hotspot2: fix typo in the getter functions Bug: 34862444 Test: frameworks/base/wifi/tests/runtests.sh Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: If833fb06cead7df9d631b3b12d66d05b8422d46c --- api/current.txt | 8 ++++---- api/system-current.txt | 8 ++++---- api/test-current.txt | 8 ++++---- .../android/net/wifi/hotspot2/PasspointConfiguration.java | 2 +- wifi/java/android/net/wifi/hotspot2/pps/Credential.java | 2 +- wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java | 2 +- wifi/java/android/net/wifi/hotspot2/pps/Policy.java | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/current.txt b/api/current.txt index ef9bf1e27c321..4528361027d31 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26086,7 +26086,7 @@ package android.net.wifi.hotspot2 { method public java.lang.String getSubscriptionType(); method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); method public java.util.Map getTrustRootCertList(); - method public int getUpdateIdentififer(); + method public int getUpdateIdentifier(); method public long getUsageLimitDataLimit(); method public long getUsageLimitStartTimeInMs(); method public long getUsageLimitTimeLimitInMinutes(); @@ -26128,7 +26128,7 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.security.cert.X509Certificate getCaCertificate(); method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); - method public boolean getCheckAaaServerStatus(); + method public boolean getCheckAaaServerCertStatus(); method public java.security.cert.X509Certificate[] getClientCertificateChain(); method public java.security.PrivateKey getClientPrivateKey(); method public long getCreationTimeInMs(); @@ -26209,7 +26209,7 @@ package android.net.wifi.hotspot2.pps { method public java.util.Map getHomeNetworkIds(); method public java.lang.String getIconUrl(); method public long[] getMatchAllOis(); - method public long[] getMatchAnysOis(); + method public long[] getMatchAnyOis(); method public java.lang.String[] getOtherHomePartners(); method public long[] getRoamingConsortiumOis(); method public void setFqdn(java.lang.String); @@ -26231,7 +26231,7 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.lang.String[] getExcludedSsidList(); method public int getMaximumBssLoadValue(); - method public long getMinHomeDownlinkBandWidht(); + method public long getMinHomeDownlinkBandwidth(); method public long getMinHomeUplinkBandwidth(); method public long getMinRoamingDownlinkBandwidth(); method public long getMinRoamingUplinkBandwidth(); diff --git a/api/system-current.txt b/api/system-current.txt index a670ee1a600a7..f6e4bb019c1a9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28796,7 +28796,7 @@ package android.net.wifi.hotspot2 { method public java.lang.String getSubscriptionType(); method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); method public java.util.Map getTrustRootCertList(); - method public int getUpdateIdentififer(); + method public int getUpdateIdentifier(); method public long getUsageLimitDataLimit(); method public long getUsageLimitStartTimeInMs(); method public long getUsageLimitTimeLimitInMinutes(); @@ -28838,7 +28838,7 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.security.cert.X509Certificate getCaCertificate(); method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); - method public boolean getCheckAaaServerStatus(); + method public boolean getCheckAaaServerCertStatus(); method public java.security.cert.X509Certificate[] getClientCertificateChain(); method public java.security.PrivateKey getClientPrivateKey(); method public long getCreationTimeInMs(); @@ -28919,7 +28919,7 @@ package android.net.wifi.hotspot2.pps { method public java.util.Map getHomeNetworkIds(); method public java.lang.String getIconUrl(); method public long[] getMatchAllOis(); - method public long[] getMatchAnysOis(); + method public long[] getMatchAnyOis(); method public java.lang.String[] getOtherHomePartners(); method public long[] getRoamingConsortiumOis(); method public void setFqdn(java.lang.String); @@ -28941,7 +28941,7 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.lang.String[] getExcludedSsidList(); method public int getMaximumBssLoadValue(); - method public long getMinHomeDownlinkBandWidht(); + method public long getMinHomeDownlinkBandwidth(); method public long getMinHomeUplinkBandwidth(); method public long getMinRoamingDownlinkBandwidth(); method public long getMinRoamingUplinkBandwidth(); diff --git a/api/test-current.txt b/api/test-current.txt index 2357e2f0a784e..97cd19274e41c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -26178,7 +26178,7 @@ package android.net.wifi.hotspot2 { method public java.lang.String getSubscriptionType(); method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); method public java.util.Map getTrustRootCertList(); - method public int getUpdateIdentififer(); + method public int getUpdateIdentifier(); method public long getUsageLimitDataLimit(); method public long getUsageLimitStartTimeInMs(); method public long getUsageLimitTimeLimitInMinutes(); @@ -26220,7 +26220,7 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.security.cert.X509Certificate getCaCertificate(); method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); - method public boolean getCheckAaaServerStatus(); + method public boolean getCheckAaaServerCertStatus(); method public java.security.cert.X509Certificate[] getClientCertificateChain(); method public java.security.PrivateKey getClientPrivateKey(); method public long getCreationTimeInMs(); @@ -26301,7 +26301,7 @@ package android.net.wifi.hotspot2.pps { method public java.util.Map getHomeNetworkIds(); method public java.lang.String getIconUrl(); method public long[] getMatchAllOis(); - method public long[] getMatchAnysOis(); + method public long[] getMatchAnyOis(); method public java.lang.String[] getOtherHomePartners(); method public long[] getRoamingConsortiumOis(); method public void setFqdn(java.lang.String); @@ -26323,7 +26323,7 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.lang.String[] getExcludedSsidList(); method public int getMaximumBssLoadValue(); - method public long getMinHomeDownlinkBandWidht(); + method public long getMinHomeDownlinkBandwidth(); method public long getMinHomeUplinkBandwidth(); method public long getMinRoamingDownlinkBandwidth(); method public long getMinRoamingUplinkBandwidth(); diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java index 7b73b4bcc946c..1f661c4580aff 100644 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java @@ -120,7 +120,7 @@ public final class PasspointConfiguration implements Parcelable { public void setUpdateIdentifier(int updateIdentifier) { mUpdateIdentifier = updateIdentifier; } - public int getUpdateIdentififer() { + public int getUpdateIdentifier() { return mUpdateIdentifier; } diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java index 025d4d3892536..620759df8f1d7 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java @@ -100,7 +100,7 @@ public final class Credential implements Parcelable { public void setCheckAaaServerCertStatus(boolean checkAaaServerCertStatus) { mCheckAaaServerCertStatus = checkAaaServerCertStatus; } - public boolean getCheckAaaServerStatus() { + public boolean getCheckAaaServerCertStatus() { return mCheckAaaServerCertStatus; } diff --git a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java index 7a4612916bb99..8ec40c00304fd 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java @@ -131,7 +131,7 @@ public final class HomeSp implements Parcelable { public void setMatchAnyOis(long[] matchAnyOis) { mMatchAnyOis = matchAnyOis; } - public long[] getMatchAnysOis() { + public long[] getMatchAnyOis() { return mMatchAnyOis; } diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java index caca0e4bd1d22..63238e86c0fdb 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java @@ -77,7 +77,7 @@ public final class Policy implements Parcelable { public void setMinHomeDownlinkBandwidth(long minHomeDownlinkBandwidth) { mMinHomeDownlinkBandwidth = minHomeDownlinkBandwidth; } - public long getMinHomeDownlinkBandWidht() { + public long getMinHomeDownlinkBandwidth() { return mMinHomeDownlinkBandwidth; } private long mMinHomeUplinkBandwidth = Long.MIN_VALUE;