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

Commit d3146f3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "hotspot2: fix typo in the getter functions"

parents 89e6bf05 701a4b55

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -25030,7 +25030,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<java.lang.String, byte[]> getTrustRootCertList();

    method public int getUpdateIdentififer();

    method public int getUpdateIdentifier();

    method public long getUsageLimitDataLimit();

    method public long getUsageLimitStartTimeInMs();

    method public long getUsageLimitTimeLimitInMinutes();
@@ -25072,7 +25072,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();
@@ -25153,7 +25153,7 @@ package android.net.wifi.hotspot2.pps { 
    method public java.util.Map<java.lang.String, java.lang.Long> 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);
@@ -25175,7 +25175,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();

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -27583,7 +27583,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<java.lang.String, byte[]> getTrustRootCertList();

    method public int getUpdateIdentififer();

    method public int getUpdateIdentifier();

    method public long getUsageLimitDataLimit();

    method public long getUsageLimitStartTimeInMs();

    method public long getUsageLimitTimeLimitInMinutes();
@@ -27625,7 +27625,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();
@@ -27706,7 +27706,7 @@ package android.net.wifi.hotspot2.pps { 
    method public java.util.Map<java.lang.String, java.lang.Long> 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);
@@ -27728,7 +27728,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();

api/test-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -25103,7 +25103,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<java.lang.String, byte[]> getTrustRootCertList();

    method public int getUpdateIdentififer();

    method public int getUpdateIdentifier();

    method public long getUsageLimitDataLimit();

    method public long getUsageLimitStartTimeInMs();

    method public long getUsageLimitTimeLimitInMinutes();
@@ -25145,7 +25145,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();
@@ -25226,7 +25226,7 @@ package android.net.wifi.hotspot2.pps { 
    method public java.util.Map<java.lang.String, java.lang.Long> 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);
@@ -25248,7 +25248,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();

wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

wifi/java/android/net/wifi/hotspot2/pps/Credential.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }