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

Commit 6305ebd6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "hotspot2: fix typo in the getter functions"

parents bf99f78a 8dee6198

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -26087,7 +26087,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();
@@ -26129,7 +26129,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();
@@ -26210,7 +26210,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);
@@ -26232,7 +26232,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
@@ -28797,7 +28797,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();
@@ -28839,7 +28839,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();
@@ -28920,7 +28920,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);
@@ -28942,7 +28942,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
@@ -26179,7 +26179,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();
@@ -26221,7 +26221,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();
@@ -26302,7 +26302,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);
@@ -26324,7 +26324,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;

    }