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

Merge "hotspot2: update method name for timestamp related APIs" into oc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2017-05-01 21:57:28 +00:00
committed by Android (Google) Code Review
parent 71a17a4307 967501ec98
commit b6f66cf931
9 changed files with 105 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/current.txt
View File

@@ -26740,28 +26740,28 @@ package android.net.wifi.hotspot2 {
method public int getCredentialPriority();
method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();
method public android.net.wifi.hotspot2.pps.Policy getPolicy();
method public long getSubscriptionCreationTimeInMs();
method public long getSubscriptionExpirationTimeInMs();
method public long getSubscriptionCreationTimeInMillis();
method public long getSubscriptionExpirationTimeInMillis();
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 getUpdateIdentifier();
method public long getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitStartTimeInMillis();
method public long getUsageLimitTimeLimitInMinutes();
method public long getUsageLimitUsageTimePeriodInMinutes();
method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
method public void setCredentialPriority(int);
method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public void setPolicy(android.net.wifi.hotspot2.pps.Policy);
method public void setSubscriptionCreationTimeInMs(long);
method public void setSubscriptionExpirationTimeInMs(long);
method public void setSubscriptionCreationTimeInMillis(long);
method public void setSubscriptionExpirationTimeInMillis(long);
method public void setSubscriptionType(java.lang.String);
method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>);
method public void setUpdateIdentifier(int);
method public void setUsageLimitDataLimit(long);
method public void setUsageLimitStartTimeInMs(long);
method public void setUsageLimitStartTimeInMillis(long);
method public void setUsageLimitTimeLimitInMinutes(long);
method public void setUsageLimitUsageTimePeriodInMinutes(long);
method public void writeToParcel(android.os.Parcel, int);
@@ -26789,8 +26789,8 @@ package android.net.wifi.hotspot2.pps {
method public boolean getCheckAaaServerCertStatus();
method public java.security.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs();
method public long getExpirationTimeInMs();
method public long getCreationTimeInMillis();
method public long getExpirationTimeInMillis();
method public java.lang.String getRealm();
method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential();
method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential();
@@ -26799,8 +26799,8 @@ package android.net.wifi.hotspot2.pps {
method public void setCheckAaaServerCertStatus(boolean);
method public void setClientCertificateChain(java.security.cert.X509Certificate[]);
method public void setClientPrivateKey(java.security.PrivateKey);
method public void setCreationTimeInMs(long);
method public void setExpirationTimeInMs(long);
method public void setCreationTimeInMillis(long);
method public void setExpirationTimeInMillis(long);
method public void setRealm(java.lang.String);
method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);

20
api/system-current.txt
View File

@@ -29490,28 +29490,28 @@ package android.net.wifi.hotspot2 {
method public int getCredentialPriority();
method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();
method public android.net.wifi.hotspot2.pps.Policy getPolicy();
method public long getSubscriptionCreationTimeInMs();
method public long getSubscriptionExpirationTimeInMs();
method public long getSubscriptionCreationTimeInMillis();
method public long getSubscriptionExpirationTimeInMillis();
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 getUpdateIdentifier();
method public long getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitStartTimeInMillis();
method public long getUsageLimitTimeLimitInMinutes();
method public long getUsageLimitUsageTimePeriodInMinutes();
method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
method public void setCredentialPriority(int);
method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public void setPolicy(android.net.wifi.hotspot2.pps.Policy);
method public void setSubscriptionCreationTimeInMs(long);
method public void setSubscriptionExpirationTimeInMs(long);
method public void setSubscriptionCreationTimeInMillis(long);
method public void setSubscriptionExpirationTimeInMillis(long);
method public void setSubscriptionType(java.lang.String);
method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>);
method public void setUpdateIdentifier(int);
method public void setUsageLimitDataLimit(long);
method public void setUsageLimitStartTimeInMs(long);
method public void setUsageLimitStartTimeInMillis(long);
method public void setUsageLimitTimeLimitInMinutes(long);
method public void setUsageLimitUsageTimePeriodInMinutes(long);
method public void writeToParcel(android.os.Parcel, int);
@@ -29539,8 +29539,8 @@ package android.net.wifi.hotspot2.pps {
method public boolean getCheckAaaServerCertStatus();
method public java.security.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs();
method public long getExpirationTimeInMs();
method public long getCreationTimeInMillis();
method public long getExpirationTimeInMillis();
method public java.lang.String getRealm();
method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential();
method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential();
@@ -29549,8 +29549,8 @@ package android.net.wifi.hotspot2.pps {
method public void setCheckAaaServerCertStatus(boolean);
method public void setClientCertificateChain(java.security.cert.X509Certificate[]);
method public void setClientPrivateKey(java.security.PrivateKey);
method public void setCreationTimeInMs(long);
method public void setExpirationTimeInMs(long);
method public void setCreationTimeInMillis(long);
method public void setExpirationTimeInMillis(long);
method public void setRealm(java.lang.String);
method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);

20
api/test-current.txt
View File

@@ -26848,28 +26848,28 @@ package android.net.wifi.hotspot2 {
method public int getCredentialPriority();
method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();
method public android.net.wifi.hotspot2.pps.Policy getPolicy();
method public long getSubscriptionCreationTimeInMs();
method public long getSubscriptionExpirationTimeInMs();
method public long getSubscriptionCreationTimeInMillis();
method public long getSubscriptionExpirationTimeInMillis();
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 getUpdateIdentifier();
method public long getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitStartTimeInMillis();
method public long getUsageLimitTimeLimitInMinutes();
method public long getUsageLimitUsageTimePeriodInMinutes();
method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
method public void setCredentialPriority(int);
method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public void setPolicy(android.net.wifi.hotspot2.pps.Policy);
method public void setSubscriptionCreationTimeInMs(long);
method public void setSubscriptionExpirationTimeInMs(long);
method public void setSubscriptionCreationTimeInMillis(long);
method public void setSubscriptionExpirationTimeInMillis(long);
method public void setSubscriptionType(java.lang.String);
method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>);
method public void setUpdateIdentifier(int);
method public void setUsageLimitDataLimit(long);
method public void setUsageLimitStartTimeInMs(long);
method public void setUsageLimitStartTimeInMillis(long);
method public void setUsageLimitTimeLimitInMinutes(long);
method public void setUsageLimitUsageTimePeriodInMinutes(long);
method public void writeToParcel(android.os.Parcel, int);
@@ -26897,8 +26897,8 @@ package android.net.wifi.hotspot2.pps {
method public boolean getCheckAaaServerCertStatus();
method public java.security.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs();
method public long getExpirationTimeInMs();
method public long getCreationTimeInMillis();
method public long getExpirationTimeInMillis();
method public java.lang.String getRealm();
method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential();
method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential();
@@ -26907,8 +26907,8 @@ package android.net.wifi.hotspot2.pps {
method public void setCheckAaaServerCertStatus(boolean);
method public void setClientCertificateChain(java.security.cert.X509Certificate[]);
method public void setClientPrivateKey(java.security.PrivateKey);
method public void setCreationTimeInMs(long);
method public void setExpirationTimeInMs(long);
method public void setCreationTimeInMillis(long);
method public void setExpirationTimeInMillis(long);
method public void setRealm(java.lang.String);
method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);

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

@@ -144,12 +144,12 @@ public final class PasspointConfiguration implements Parcelable {
*
* Use Long.MIN_VALUE to indicate unset value.
*/
private long mSubscriptionCreationTimeInMs = Long.MIN_VALUE;
public void setSubscriptionCreationTimeInMs(long subscriptionCreationTimeInMs) {
mSubscriptionCreationTimeInMs = subscriptionCreationTimeInMs;
private long mSubscriptionCreationTimeInMillis = Long.MIN_VALUE;
public void setSubscriptionCreationTimeInMillis(long subscriptionCreationTimeInMillis) {
mSubscriptionCreationTimeInMillis = subscriptionCreationTimeInMillis;
}
public long getSubscriptionCreationTimeInMs() {
return mSubscriptionCreationTimeInMs;
public long getSubscriptionCreationTimeInMillis() {
return mSubscriptionCreationTimeInMillis;
}
/**
@@ -158,12 +158,12 @@ public final class PasspointConfiguration implements Parcelable {
*
* Use Long.MIN_VALUE to indicate unset value.
*/
private long mSubscriptionExpirationTimeInMs = Long.MIN_VALUE;
public void setSubscriptionExpirationTimeInMs(long subscriptionExpirationTimeInMs) {
mSubscriptionExpirationTimeInMs = subscriptionExpirationTimeInMs;
private long mSubscriptionExpirationTimeInMillis = Long.MIN_VALUE;
public void setSubscriptionExpirationTimeInMillis(long subscriptionExpirationTimeInMillis) {
mSubscriptionExpirationTimeInMillis = subscriptionExpirationTimeInMillis;
}
public long getSubscriptionExpirationTimeInMs() {
return mSubscriptionExpirationTimeInMs;
public long getSubscriptionExpirationTimeInMillis() {
return mSubscriptionExpirationTimeInMillis;
}
/**
@@ -197,12 +197,12 @@ public final class PasspointConfiguration implements Parcelable {
*
* Use Long.MIN_VALUE to indicate unset value.
*/
private long mUsageLimitStartTimeInMs = Long.MIN_VALUE;
public void setUsageLimitStartTimeInMs(long usageLimitStartTimeInMs) {
mUsageLimitStartTimeInMs = usageLimitStartTimeInMs;
private long mUsageLimitStartTimeInMillis = Long.MIN_VALUE;
public void setUsageLimitStartTimeInMillis(long usageLimitStartTimeInMillis) {
mUsageLimitStartTimeInMillis = usageLimitStartTimeInMillis;
}
public long getUsageLimitStartTimeInMs() {
return mUsageLimitStartTimeInMs;
public long getUsageLimitStartTimeInMillis() {
return mUsageLimitStartTimeInMillis;
}
/**
@@ -263,11 +263,11 @@ public final class PasspointConfiguration implements Parcelable {
}
mUpdateIdentifier = source.mUpdateIdentifier;
mCredentialPriority = source.mCredentialPriority;
mSubscriptionCreationTimeInMs = source.mSubscriptionCreationTimeInMs;
mSubscriptionExpirationTimeInMs = source.mSubscriptionExpirationTimeInMs;
mSubscriptionCreationTimeInMillis = source.mSubscriptionCreationTimeInMillis;
mSubscriptionExpirationTimeInMillis = source.mSubscriptionExpirationTimeInMillis;
mSubscriptionType = source.mSubscriptionType;
mUsageLimitDataLimit = source.mUsageLimitDataLimit;
mUsageLimitStartTimeInMs = source.mUsageLimitStartTimeInMs;
mUsageLimitStartTimeInMillis = source.mUsageLimitStartTimeInMillis;
mUsageLimitTimeLimitInMinutes = source.mUsageLimitTimeLimitInMinutes;
mUsageLimitUsageTimePeriodInMinutes = source.mUsageLimitUsageTimePeriodInMinutes;
}
@@ -286,11 +286,11 @@ public final class PasspointConfiguration implements Parcelable {
writeTrustRootCerts(dest, mTrustRootCertList);
dest.writeInt(mUpdateIdentifier);
dest.writeInt(mCredentialPriority);
dest.writeLong(mSubscriptionCreationTimeInMs);
dest.writeLong(mSubscriptionExpirationTimeInMs);
dest.writeLong(mSubscriptionCreationTimeInMillis);
dest.writeLong(mSubscriptionExpirationTimeInMillis);
dest.writeString(mSubscriptionType);
dest.writeLong(mUsageLimitUsageTimePeriodInMinutes);
dest.writeLong(mUsageLimitStartTimeInMs);
dest.writeLong(mUsageLimitStartTimeInMillis);
dest.writeLong(mUsageLimitDataLimit);
dest.writeLong(mUsageLimitTimeLimitInMinutes);
}
@@ -313,11 +313,11 @@ public final class PasspointConfiguration implements Parcelable {
&& isTrustRootCertListEquals(mTrustRootCertList, that.mTrustRootCertList)
&& mUpdateIdentifier == that.mUpdateIdentifier
&& mCredentialPriority == that.mCredentialPriority
&& mSubscriptionCreationTimeInMs == that.mSubscriptionCreationTimeInMs
&& mSubscriptionExpirationTimeInMs == that.mSubscriptionExpirationTimeInMs
&& mSubscriptionCreationTimeInMillis == that.mSubscriptionCreationTimeInMillis
&& mSubscriptionExpirationTimeInMillis == that.mSubscriptionExpirationTimeInMillis
&& TextUtils.equals(mSubscriptionType, that.mSubscriptionType)
&& mUsageLimitUsageTimePeriodInMinutes == that.mUsageLimitUsageTimePeriodInMinutes
&& mUsageLimitStartTimeInMs == that.mUsageLimitStartTimeInMs
&& mUsageLimitStartTimeInMillis == that.mUsageLimitStartTimeInMillis
&& mUsageLimitDataLimit == that.mUsageLimitDataLimit
&& mUsageLimitTimeLimitInMinutes == that.mUsageLimitTimeLimitInMinutes;
}
@@ -325,9 +325,9 @@ public final class PasspointConfiguration implements Parcelable {
@Override
public int hashCode() {
return Objects.hash(mHomeSp, mCredential, mPolicy, mSubscriptionUpdate, mTrustRootCertList,
mUpdateIdentifier, mCredentialPriority, mSubscriptionCreationTimeInMs,
mSubscriptionExpirationTimeInMs, mUsageLimitUsageTimePeriodInMinutes,
mUsageLimitStartTimeInMs, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes);
mUpdateIdentifier, mCredentialPriority, mSubscriptionCreationTimeInMillis,
mSubscriptionExpirationTimeInMillis, mUsageLimitUsageTimePeriodInMinutes,
mUsageLimitStartTimeInMillis, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes);
}
@Override
@@ -336,13 +336,13 @@ public final class PasspointConfiguration implements Parcelable {
builder.append("UpdateIdentifier: ").append(mUpdateIdentifier).append("\n");
builder.append("CredentialPriority: ").append(mCredentialPriority).append("\n");
builder.append("SubscriptionCreationTime: ").append(
mSubscriptionCreationTimeInMs != Long.MIN_VALUE
? new Date(mSubscriptionCreationTimeInMs) : "Not specified").append("\n");
mSubscriptionCreationTimeInMillis != Long.MIN_VALUE
? new Date(mSubscriptionCreationTimeInMillis) : "Not specified").append("\n");
builder.append("SubscriptionExpirationTime: ").append(
mSubscriptionExpirationTimeInMs != Long.MIN_VALUE
? new Date(mSubscriptionExpirationTimeInMs) : "Not specified").append("\n");
builder.append("UsageLimitStartTime: ").append(mUsageLimitStartTimeInMs != Long.MIN_VALUE
? new Date(mUsageLimitStartTimeInMs) : "Not specified").append("\n");
mSubscriptionExpirationTimeInMillis != Long.MIN_VALUE
? new Date(mSubscriptionExpirationTimeInMillis) : "Not specified").append("\n");
builder.append("UsageLimitStartTime: ").append(mUsageLimitStartTimeInMillis != Long.MIN_VALUE
? new Date(mUsageLimitStartTimeInMillis) : "Not specified").append("\n");
builder.append("UsageTimePeriod: ").append(mUsageLimitUsageTimePeriodInMinutes)
.append("\n");
builder.append("UsageLimitDataLimit: ").append(mUsageLimitDataLimit).append("\n");
@@ -433,11 +433,11 @@ public final class PasspointConfiguration implements Parcelable {
config.setTrustRootCertList(readTrustRootCerts(in));
config.setUpdateIdentifier(in.readInt());
config.setCredentialPriority(in.readInt());
config.setSubscriptionCreationTimeInMs(in.readLong());
config.setSubscriptionExpirationTimeInMs(in.readLong());
config.setSubscriptionCreationTimeInMillis(in.readLong());
config.setSubscriptionExpirationTimeInMillis(in.readLong());
config.setSubscriptionType(in.readString());
config.setUsageLimitUsageTimePeriodInMinutes(in.readLong());
config.setUsageLimitStartTimeInMs(in.readLong());
config.setUsageLimitStartTimeInMillis(in.readLong());
config.setUsageLimitDataLimit(in.readLong());
config.setUsageLimitTimeLimitInMinutes(in.readLong());
return config;

10
wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java
View File

@@ -903,10 +903,10 @@ public final class PpsMoParser {
for (PPSNode child: node.getChildren()) {
switch (child.getName()) {
case NODE_CREATION_DATE:
credential.setCreationTimeInMs(parseDate(getPpsNodeValue(child)));
credential.setCreationTimeInMillis(parseDate(getPpsNodeValue(child)));
break;
case NODE_EXPIRATION_DATE:
credential.setExpirationTimeInMs(parseDate(getPpsNodeValue(child)));
credential.setExpirationTimeInMillis(parseDate(getPpsNodeValue(child)));
break;
case NODE_USERNAME_PASSWORD:
credential.setUserCredential(parseUserCredential(child));
@@ -1517,10 +1517,10 @@ public final class PpsMoParser {
for (PPSNode child : node.getChildren()) {
switch (child.getName()) {
case NODE_CREATION_DATE:
config.setSubscriptionCreationTimeInMs(parseDate(getPpsNodeValue(child)));
config.setSubscriptionCreationTimeInMillis(parseDate(getPpsNodeValue(child)));
break;
case NODE_EXPIRATION_DATE:
config.setSubscriptionExpirationTimeInMs(parseDate(getPpsNodeValue(child)));
config.setSubscriptionExpirationTimeInMillis(parseDate(getPpsNodeValue(child)));
break;
case NODE_TYPE_OF_SUBSCRIPTION:
config.setSubscriptionType(getPpsNodeValue(child));
@@ -1555,7 +1555,7 @@ public final class PpsMoParser {
config.setUsageLimitDataLimit(parseLong(getPpsNodeValue(child), 10));
break;
case NODE_START_DATE:
config.setUsageLimitStartTimeInMs(parseDate(getPpsNodeValue(child)));
config.setUsageLimitStartTimeInMillis(parseDate(getPpsNodeValue(child)));
break;
case NODE_TIME_LIMIT:
config.setUsageLimitTimeLimitInMinutes(parseLong(getPpsNodeValue(child), 10));

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

@@ -58,12 +58,12 @@ public final class Credential implements Parcelable {
* of milliseconds since January 1, 1970, 00:00:00 GMT.
* Using Long.MIN_VALUE to indicate unset value.
*/
private long mCreationTimeInMs = Long.MIN_VALUE;
public void setCreationTimeInMs(long creationTimeInMs) {
mCreationTimeInMs = creationTimeInMs;
private long mCreationTimeInMillis = Long.MIN_VALUE;
public void setCreationTimeInMillis(long creationTimeInMillis) {
mCreationTimeInMillis = creationTimeInMillis;
}
public long getCreationTimeInMs() {
return mCreationTimeInMs;
public long getCreationTimeInMillis() {
return mCreationTimeInMillis;
}
/**
@@ -71,12 +71,12 @@ public final class Credential implements Parcelable {
* of milliseconds since January 1, 1970, 00:00:00 GMT.
* Using Long.MIN_VALUE to indicate unset value.
*/
private long mExpirationTimeInMs = Long.MIN_VALUE;
public void setExpirationTimeInMs(long expirationTimeInMs) {
mExpirationTimeInMs = expirationTimeInMs;
private long mExpirationTimeInMillis = Long.MIN_VALUE;
public void setExpirationTimeInMillis(long expirationTimeInMillis) {
mExpirationTimeInMillis = expirationTimeInMillis;
}
public long getExpirationTimeInMs() {
return mExpirationTimeInMs;
public long getExpirationTimeInMillis() {
return mExpirationTimeInMillis;
}
/**
@@ -720,8 +720,8 @@ public final class Credential implements Parcelable {
*/
public Credential(Credential source) {
if (source != null) {
mCreationTimeInMs = source.mCreationTimeInMs;
mExpirationTimeInMs = source.mExpirationTimeInMs;
mCreationTimeInMillis = source.mCreationTimeInMillis;
mExpirationTimeInMillis = source.mExpirationTimeInMillis;
mRealm = source.mRealm;
mCheckAaaServerCertStatus = source.mCheckAaaServerCertStatus;
if (source.mUserCredential != null) {
@@ -749,8 +749,8 @@ public final class Credential implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(mCreationTimeInMs);
dest.writeLong(mExpirationTimeInMs);
dest.writeLong(mCreationTimeInMillis);
dest.writeLong(mExpirationTimeInMillis);
dest.writeString(mRealm);
dest.writeInt(mCheckAaaServerCertStatus ? 1 : 0);
dest.writeParcelable(mUserCredential, flags);
@@ -772,8 +772,8 @@ public final class Credential implements Parcelable {
Credential that = (Credential) thatObject;
return TextUtils.equals(mRealm, that.mRealm)
&& mCreationTimeInMs == that.mCreationTimeInMs
&& mExpirationTimeInMs == that.mExpirationTimeInMs
&& mCreationTimeInMillis == that.mCreationTimeInMillis
&& mExpirationTimeInMillis == that.mExpirationTimeInMillis
&& mCheckAaaServerCertStatus == that.mCheckAaaServerCertStatus
&& (mUserCredential == null ? that.mUserCredential == null
: mUserCredential.equals(that.mUserCredential))
@@ -788,7 +788,7 @@ public final class Credential implements Parcelable {
@Override
public int hashCode() {
return Objects.hash(mRealm, mCreationTimeInMs, mExpirationTimeInMs,
return Objects.hash(mRealm, mCreationTimeInMillis, mExpirationTimeInMillis,
mCheckAaaServerCertStatus, mUserCredential, mCertCredential, mSimCredential,
mCaCertificate, mClientCertificateChain, mClientPrivateKey);
}
@@ -797,10 +797,10 @@ public final class Credential implements Parcelable {
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("Realm: ").append(mRealm).append("\n");
builder.append("CreationTime: ").append(mCreationTimeInMs != Long.MIN_VALUE
? new Date(mCreationTimeInMs) : "Not specified").append("\n");
builder.append("ExpirationTime: ").append(mExpirationTimeInMs != Long.MIN_VALUE
? new Date(mExpirationTimeInMs) : "Not specified").append("\n");
builder.append("CreationTime: ").append(mCreationTimeInMillis != Long.MIN_VALUE
? new Date(mCreationTimeInMillis) : "Not specified").append("\n");
builder.append("ExpirationTime: ").append(mExpirationTimeInMillis != Long.MIN_VALUE
? new Date(mExpirationTimeInMillis) : "Not specified").append("\n");
builder.append("CheckAAAServerStatus: ").append(mCheckAaaServerCertStatus).append("\n");
if (mUserCredential != null) {
builder.append("UserCredential Begin ---\n");
@@ -863,8 +863,8 @@ public final class Credential implements Parcelable {
@Override
public Credential createFromParcel(Parcel in) {
Credential credential = new Credential();
credential.setCreationTimeInMs(in.readLong());
credential.setExpirationTimeInMs(in.readLong());
credential.setCreationTimeInMillis(in.readLong());
credential.setExpirationTimeInMillis(in.readLong());
credential.setRealm(in.readString());
credential.setCheckAaaServerCertStatus(in.readInt() != 0);
credential.setUserCredential(in.readParcelable(null));

6
wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java
View File

@@ -158,11 +158,11 @@ public class PasspointConfigurationTest {
config.setTrustRootCertList(trustRootCertList);
config.setUpdateIdentifier(1);
config.setCredentialPriority(120);
config.setSubscriptionCreationTimeInMs(231200);
config.setSubscriptionExpirationTimeInMs(2134232);
config.setSubscriptionCreationTimeInMillis(231200);
config.setSubscriptionExpirationTimeInMillis(2134232);
config.setSubscriptionType("Gold");
config.setUsageLimitUsageTimePeriodInMinutes(3600);
config.setUsageLimitStartTimeInMs(124214213);
config.setUsageLimitStartTimeInMillis(124214213);
config.setUsageLimitDataLimit(14121);
config.setUsageLimitTimeLimitInMinutes(78912);
return config;

10
wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java
View File

@@ -113,11 +113,11 @@ public class PpsMoParserTest {
config.setSubscriptionUpdate(subscriptionUpdate);
// Subscription parameters.
config.setSubscriptionCreationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime());
config.setSubscriptionExpirationTimeInMs(format.parse("2016-03-01T10:00:00Z").getTime());
config.setSubscriptionCreationTimeInMillis(format.parse("2016-02-01T10:00:00Z").getTime());
config.setSubscriptionExpirationTimeInMillis(format.parse("2016-03-01T10:00:00Z").getTime());
config.setSubscriptionType("Gold");
config.setUsageLimitDataLimit(921890);
config.setUsageLimitStartTimeInMs(format.parse("2016-12-01T10:00:00Z").getTime());
config.setUsageLimitStartTimeInMillis(format.parse("2016-12-01T10:00:00Z").getTime());
config.setUsageLimitTimeLimitInMinutes(120);
config.setUsageLimitUsageTimePeriodInMinutes(99910);
@@ -138,8 +138,8 @@ public class PpsMoParserTest {
// Credential configuration.
Credential credential = new Credential();
credential.setCreationTimeInMs(format.parse("2016-01-01T10:00:00Z").getTime());
credential.setExpirationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime());
credential.setCreationTimeInMillis(format.parse("2016-01-01T10:00:00Z").getTime());
credential.setExpirationTimeInMillis(format.parse("2016-02-01T10:00:00Z").getTime());
credential.setRealm("shaken.stirred.com");
credential.setCheckAaaServerCertStatus(true);
Credential.UserCredential userCredential = new Credential.UserCredential();

6
wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java
View File

@@ -56,8 +56,8 @@ public class CredentialTest {
X509Certificate[] clientCertificateChain,
PrivateKey clientPrivateKey) {
Credential cred = new Credential();
cred.setCreationTimeInMs(123455L);
cred.setExpirationTimeInMs(2310093L);
cred.setCreationTimeInMillis(123455L);
cred.setExpirationTimeInMillis(2310093L);
cred.setRealm("realm");
cred.setCheckAaaServerCertStatus(true);
cred.setUserCredential(userCred);
@@ -440,4 +440,4 @@ public class CredentialTest {
Credential copyCred = new Credential(sourceCred);
assertTrue(copyCred.equals(sourceCred));
}
}
}