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

Commit b6f66cf9 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents 71a17a43 967501ec

api/current.txt

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

api/system-current.txt

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

api/test-current.txt

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

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

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

wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java

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