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

Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c

Browse Source 
am: 5644c190a0

Change-Id: Idac3a70dc9c8a10e82076014078d7b5af3acac72
This commit is contained in:
Peter Qiu
2017-02-13 20:07:16 +00:00
committed by android-build-merger
parent 2155f773db 5644c190a0
commit 1b510ecff7
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -25030,7 +25030,7 @@ package android.net.wifi.hotspot2 {
method public java.lang.String getSubscriptionType(); method public java.lang.String getSubscriptionType();
method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate();
method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList(); 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 getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs(); method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitTimeLimitInMinutes(); method public long getUsageLimitTimeLimitInMinutes();
@@ -25072,7 +25072,7 @@ package android.net.wifi.hotspot2.pps {
method public int describeContents(); method public int describeContents();
method public java.security.cert.X509Certificate getCaCertificate(); method public java.security.cert.X509Certificate getCaCertificate();
method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); 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.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey(); method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs(); 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.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds();
method public java.lang.String getIconUrl(); method public java.lang.String getIconUrl();
method public long[] getMatchAllOis(); method public long[] getMatchAllOis();
method public long[] getMatchAnysOis(); method public long[] getMatchAnyOis();
method public java.lang.String[] getOtherHomePartners(); method public java.lang.String[] getOtherHomePartners();
method public long[] getRoamingConsortiumOis(); method public long[] getRoamingConsortiumOis();
method public void setFqdn(java.lang.String); method public void setFqdn(java.lang.String);
@@ -25175,7 +25175,7 @@ package android.net.wifi.hotspot2.pps {
method public int describeContents(); method public int describeContents();
method public java.lang.String[] getExcludedSsidList(); method public java.lang.String[] getExcludedSsidList();
method public int getMaximumBssLoadValue(); method public int getMaximumBssLoadValue();
method public long getMinHomeDownlinkBandWidht(); method public long getMinHomeDownlinkBandwidth();
method public long getMinHomeUplinkBandwidth(); method public long getMinHomeUplinkBandwidth();
method public long getMinRoamingDownlinkBandwidth(); method public long getMinRoamingDownlinkBandwidth();
method public long getMinRoamingUplinkBandwidth(); method public long getMinRoamingUplinkBandwidth();

8
api/system-current.txt
View File

@@ -27583,7 +27583,7 @@ package android.net.wifi.hotspot2 {
method public java.lang.String getSubscriptionType(); method public java.lang.String getSubscriptionType();
method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate();
method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList(); 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 getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs(); method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitTimeLimitInMinutes(); method public long getUsageLimitTimeLimitInMinutes();
@@ -27625,7 +27625,7 @@ package android.net.wifi.hotspot2.pps {
method public int describeContents(); method public int describeContents();
method public java.security.cert.X509Certificate getCaCertificate(); method public java.security.cert.X509Certificate getCaCertificate();
method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); 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.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey(); method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs(); 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.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds();
method public java.lang.String getIconUrl(); method public java.lang.String getIconUrl();
method public long[] getMatchAllOis(); method public long[] getMatchAllOis();
method public long[] getMatchAnysOis(); method public long[] getMatchAnyOis();
method public java.lang.String[] getOtherHomePartners(); method public java.lang.String[] getOtherHomePartners();
method public long[] getRoamingConsortiumOis(); method public long[] getRoamingConsortiumOis();
method public void setFqdn(java.lang.String); method public void setFqdn(java.lang.String);
@@ -27728,7 +27728,7 @@ package android.net.wifi.hotspot2.pps {
method public int describeContents(); method public int describeContents();
method public java.lang.String[] getExcludedSsidList(); method public java.lang.String[] getExcludedSsidList();
method public int getMaximumBssLoadValue(); method public int getMaximumBssLoadValue();
method public long getMinHomeDownlinkBandWidht(); method public long getMinHomeDownlinkBandwidth();
method public long getMinHomeUplinkBandwidth(); method public long getMinHomeUplinkBandwidth();
method public long getMinRoamingDownlinkBandwidth(); method public long getMinRoamingDownlinkBandwidth();
method public long getMinRoamingUplinkBandwidth(); method public long getMinRoamingUplinkBandwidth();

8
api/test-current.txt
View File

@@ -25104,7 +25104,7 @@ package android.net.wifi.hotspot2 {
method public java.lang.String getSubscriptionType(); method public java.lang.String getSubscriptionType();
method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate();
method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList(); 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 getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs(); method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitTimeLimitInMinutes(); method public long getUsageLimitTimeLimitInMinutes();
@@ -25146,7 +25146,7 @@ package android.net.wifi.hotspot2.pps {
method public int describeContents(); method public int describeContents();
method public java.security.cert.X509Certificate getCaCertificate(); method public java.security.cert.X509Certificate getCaCertificate();
method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); 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.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey(); method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs(); method public long getCreationTimeInMs();
@@ -25227,7 +25227,7 @@ package android.net.wifi.hotspot2.pps {
method public java.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds(); method public java.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds();
method public java.lang.String getIconUrl(); method public java.lang.String getIconUrl();
method public long[] getMatchAllOis(); method public long[] getMatchAllOis();
method public long[] getMatchAnysOis(); method public long[] getMatchAnyOis();
method public java.lang.String[] getOtherHomePartners(); method public java.lang.String[] getOtherHomePartners();
method public long[] getRoamingConsortiumOis(); method public long[] getRoamingConsortiumOis();
method public void setFqdn(java.lang.String); method public void setFqdn(java.lang.String);
@@ -25249,7 +25249,7 @@ package android.net.wifi.hotspot2.pps {
method public int describeContents(); method public int describeContents();
method public java.lang.String[] getExcludedSsidList(); method public java.lang.String[] getExcludedSsidList();
method public int getMaximumBssLoadValue(); method public int getMaximumBssLoadValue();
method public long getMinHomeDownlinkBandWidht(); method public long getMinHomeDownlinkBandwidth();
method public long getMinHomeUplinkBandwidth(); method public long getMinHomeUplinkBandwidth();
method public long getMinRoamingDownlinkBandwidth(); method public long getMinRoamingDownlinkBandwidth();
method public long getMinRoamingUplinkBandwidth(); method public long getMinRoamingUplinkBandwidth();

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

@@ -120,7 +120,7 @@ public final class PasspointConfiguration implements Parcelable {
public void setUpdateIdentifier(int updateIdentifier) { public void setUpdateIdentifier(int updateIdentifier) {
mUpdateIdentifier = updateIdentifier; mUpdateIdentifier = updateIdentifier;
} }
public int getUpdateIdentififer() { public int getUpdateIdentifier() {
return mUpdateIdentifier; return mUpdateIdentifier;
} }

2
wifi/java/android/net/wifi/hotspot2/pps/Credential.java
View File

@@ -100,7 +100,7 @@ public final class Credential implements Parcelable {
public void setCheckAaaServerCertStatus(boolean checkAaaServerCertStatus) { public void setCheckAaaServerCertStatus(boolean checkAaaServerCertStatus) {
mCheckAaaServerCertStatus = checkAaaServerCertStatus; mCheckAaaServerCertStatus = checkAaaServerCertStatus;
} }
public boolean getCheckAaaServerStatus() { public boolean getCheckAaaServerCertStatus() {
return mCheckAaaServerCertStatus; return mCheckAaaServerCertStatus;
} }

2
wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java
View File

@@ -131,7 +131,7 @@ public final class HomeSp implements Parcelable {
public void setMatchAnyOis(long[] matchAnyOis) { public void setMatchAnyOis(long[] matchAnyOis) {
mMatchAnyOis = matchAnyOis; mMatchAnyOis = matchAnyOis;
} }
public long[] getMatchAnysOis() { public long[] getMatchAnyOis() {
return mMatchAnyOis; return mMatchAnyOis;
} }

2
wifi/java/android/net/wifi/hotspot2/pps/Policy.java
View File

@@ -77,7 +77,7 @@ public final class Policy implements Parcelable {
public void setMinHomeDownlinkBandwidth(long minHomeDownlinkBandwidth) { public void setMinHomeDownlinkBandwidth(long minHomeDownlinkBandwidth) {
mMinHomeDownlinkBandwidth = minHomeDownlinkBandwidth; mMinHomeDownlinkBandwidth = minHomeDownlinkBandwidth;
} }
public long getMinHomeDownlinkBandWidht() { public long getMinHomeDownlinkBandwidth() {
return mMinHomeDownlinkBandwidth; return mMinHomeDownlinkBandwidth;
} }
private long mMinHomeUplinkBandwidth = Long.MIN_VALUE; private long mMinHomeUplinkBandwidth = Long.MIN_VALUE;