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

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

Merge "Rename PasspointConfiguration#getSubscriptionExpirationTimeInMillis"

parents 24818449 1caf57d5

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -31730,7 +31730,7 @@ package android.net.wifi.hotspot2 { 
    method public int describeContents();

    method public int describeContents();

    method public android.net.wifi.hotspot2.pps.Credential getCredential();

    method public android.net.wifi.hotspot2.pps.Credential getCredential();

    method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();

    method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();

    method public long getSubscriptionExpirationTimeInMillis();

    method public long getSubscriptionExpirationTimeMillis();

    method @NonNull public String getUniqueId() throws java.lang.IllegalStateException;

    method @NonNull public String getUniqueId() throws java.lang.IllegalStateException;

    method public boolean isOsuProvisioned();

    method public boolean isOsuProvisioned();

    method public void setCredential(android.net.wifi.hotspot2.pps.Credential);

    method public void setCredential(android.net.wifi.hotspot2.pps.Credential);

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -359,7 +359,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
        mPasspointUniqueId = config.getUniqueId();

        mPasspointUniqueId = config.getUniqueId();

        mFqdn = config.getHomeSp().getFqdn();

        mFqdn = config.getHomeSp().getFqdn();

        mProviderFriendlyName = config.getHomeSp().getFriendlyName();

        mProviderFriendlyName = config.getHomeSp().getFriendlyName();

        mSubscriptionExpirationTimeInMillis = config.getSubscriptionExpirationTimeInMillis();

        mSubscriptionExpirationTimeInMillis = config.getSubscriptionExpirationTimeMillis();

        if (config.isOsuProvisioned()) {

        if (config.isOsuProvisioned()) {

            mPasspointConfigurationVersion = PasspointConfigurationVersion.OSU_PROVISIONED;

            mPasspointConfigurationVersion = PasspointConfigurationVersion.OSU_PROVISIONED;

        } else {

        } else {

wifi/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,7 @@ java_library { 
        // TODO(b/146757305): should be unnecessary once

        // TODO(b/146757305): should be unnecessary once

        // sdk_version="module_lib_current"

        // sdk_version="module_lib_current"

        "android_system_stubs_current",

        "android_system_stubs_current",

        "framework_mediaprovider_annotation", // for android.annotation.CurrentTimeMillisLong

    ],

    ],

    srcs: [

    srcs: [

        ":framework-wifi-updatable-sources",

        ":framework-wifi-updatable-sources",

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

+12 −10
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package android.net.wifi.hotspot2; 
import static android.net.wifi.WifiConfiguration.METERED_OVERRIDE_NONE;

import static android.net.wifi.WifiConfiguration.METERED_OVERRIDE_NONE;

import static android.net.wifi.WifiConfiguration.MeteredOverride;

import static android.net.wifi.WifiConfiguration.MeteredOverride;





import android.annotation.CurrentTimeMillisLong;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi;
@@ -247,12 +248,12 @@ public final class PasspointConfiguration implements Parcelable { 
     *

     *

     * Use Long.MIN_VALUE to indicate unset value.

     * Use Long.MIN_VALUE to indicate unset value.

     */

     */

    private long mSubscriptionExpirationTimeInMillis = Long.MIN_VALUE;

    private long mSubscriptionExpirationTimeMillis = Long.MIN_VALUE;

    /**

    /**

     * @hide

     * @hide

     */

     */

    public void setSubscriptionExpirationTimeInMillis(long subscriptionExpirationTimeInMillis) {

    public void setSubscriptionExpirationTimeInMillis(long subscriptionExpirationTimeInMillis) {

        mSubscriptionExpirationTimeInMillis = subscriptionExpirationTimeInMillis;

        mSubscriptionExpirationTimeMillis = subscriptionExpirationTimeInMillis;

    }

    }

    /**

    /**

     *  Utility method to get the time this subscription will expire. It is in the format of number

     *  Utility method to get the time this subscription will expire. It is in the format of number
@@ -260,8 +261,9 @@ public final class PasspointConfiguration implements Parcelable { 
     *

     *

     *  @return The time this subscription will expire, or Long.MIN_VALUE to indicate unset value

     *  @return The time this subscription will expire, or Long.MIN_VALUE to indicate unset value

     */

     */

    public long getSubscriptionExpirationTimeInMillis() {

    @CurrentTimeMillisLong

        return mSubscriptionExpirationTimeInMillis;

    public long getSubscriptionExpirationTimeMillis() {

        return mSubscriptionExpirationTimeMillis;

    }

    }





    /**

    /**
@@ -561,7 +563,7 @@ public final class PasspointConfiguration implements Parcelable { 
        mUpdateIdentifier = source.mUpdateIdentifier;

        mUpdateIdentifier = source.mUpdateIdentifier;

        mCredentialPriority = source.mCredentialPriority;

        mCredentialPriority = source.mCredentialPriority;

        mSubscriptionCreationTimeInMillis = source.mSubscriptionCreationTimeInMillis;

        mSubscriptionCreationTimeInMillis = source.mSubscriptionCreationTimeInMillis;

        mSubscriptionExpirationTimeInMillis = source.mSubscriptionExpirationTimeInMillis;

        mSubscriptionExpirationTimeMillis = source.mSubscriptionExpirationTimeMillis;

        mSubscriptionType = source.mSubscriptionType;

        mSubscriptionType = source.mSubscriptionType;

        mUsageLimitDataLimit = source.mUsageLimitDataLimit;

        mUsageLimitDataLimit = source.mUsageLimitDataLimit;

        mUsageLimitStartTimeInMillis = source.mUsageLimitStartTimeInMillis;

        mUsageLimitStartTimeInMillis = source.mUsageLimitStartTimeInMillis;
@@ -590,7 +592,7 @@ public final class PasspointConfiguration implements Parcelable { 
        dest.writeInt(mUpdateIdentifier);

        dest.writeInt(mUpdateIdentifier);

        dest.writeInt(mCredentialPriority);

        dest.writeInt(mCredentialPriority);

        dest.writeLong(mSubscriptionCreationTimeInMillis);

        dest.writeLong(mSubscriptionCreationTimeInMillis);

        dest.writeLong(mSubscriptionExpirationTimeInMillis);

        dest.writeLong(mSubscriptionExpirationTimeMillis);

        dest.writeString(mSubscriptionType);

        dest.writeString(mSubscriptionType);

        dest.writeLong(mUsageLimitUsageTimePeriodInMinutes);

        dest.writeLong(mUsageLimitUsageTimePeriodInMinutes);

        dest.writeLong(mUsageLimitStartTimeInMillis);

        dest.writeLong(mUsageLimitStartTimeInMillis);
@@ -628,7 +630,7 @@ public final class PasspointConfiguration implements Parcelable { 
                && mUpdateIdentifier == that.mUpdateIdentifier

                && mUpdateIdentifier == that.mUpdateIdentifier

                && mCredentialPriority == that.mCredentialPriority

                && mCredentialPriority == that.mCredentialPriority

                && mSubscriptionCreationTimeInMillis == that.mSubscriptionCreationTimeInMillis

                && mSubscriptionCreationTimeInMillis == that.mSubscriptionCreationTimeInMillis

                && mSubscriptionExpirationTimeInMillis == that.mSubscriptionExpirationTimeInMillis

                && mSubscriptionExpirationTimeMillis == that.mSubscriptionExpirationTimeMillis

                && TextUtils.equals(mSubscriptionType, that.mSubscriptionType)

                && TextUtils.equals(mSubscriptionType, that.mSubscriptionType)

                && mUsageLimitUsageTimePeriodInMinutes == that.mUsageLimitUsageTimePeriodInMinutes

                && mUsageLimitUsageTimePeriodInMinutes == that.mUsageLimitUsageTimePeriodInMinutes

                && mUsageLimitStartTimeInMillis == that.mUsageLimitStartTimeInMillis

                && mUsageLimitStartTimeInMillis == that.mUsageLimitStartTimeInMillis
@@ -646,7 +648,7 @@ public final class PasspointConfiguration implements Parcelable { 
    public int hashCode() {

    public int hashCode() {

        return Objects.hash(mHomeSp, mCredential, mPolicy, mSubscriptionUpdate, mTrustRootCertList,

        return Objects.hash(mHomeSp, mCredential, mPolicy, mSubscriptionUpdate, mTrustRootCertList,

                mUpdateIdentifier, mCredentialPriority, mSubscriptionCreationTimeInMillis,

                mUpdateIdentifier, mCredentialPriority, mSubscriptionCreationTimeInMillis,

                mSubscriptionExpirationTimeInMillis, mUsageLimitUsageTimePeriodInMinutes,

                mSubscriptionExpirationTimeMillis, mUsageLimitUsageTimePeriodInMinutes,

                mUsageLimitStartTimeInMillis, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes,

                mUsageLimitStartTimeInMillis, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes,

                mServiceFriendlyNames, mCarrierId, mIsAutojoinEnabled, mIsMacRandomizationEnabled,

                mServiceFriendlyNames, mCarrierId, mIsAutojoinEnabled, mIsMacRandomizationEnabled,

                mMeteredOverride);

                mMeteredOverride);
@@ -661,8 +663,8 @@ public final class PasspointConfiguration implements Parcelable { 
                mSubscriptionCreationTimeInMillis != Long.MIN_VALUE

                mSubscriptionCreationTimeInMillis != Long.MIN_VALUE

                ? new Date(mSubscriptionCreationTimeInMillis) : "Not specified").append("\n");

                ? new Date(mSubscriptionCreationTimeInMillis) : "Not specified").append("\n");

        builder.append("SubscriptionExpirationTime: ").append(

        builder.append("SubscriptionExpirationTime: ").append(

                mSubscriptionExpirationTimeInMillis != Long.MIN_VALUE

                mSubscriptionExpirationTimeMillis != Long.MIN_VALUE

                ? new Date(mSubscriptionExpirationTimeInMillis) : "Not specified").append("\n");

                ? new Date(mSubscriptionExpirationTimeMillis) : "Not specified").append("\n");

        builder.append("UsageLimitStartTime: ").append(mUsageLimitStartTimeInMillis != Long.MIN_VALUE

        builder.append("UsageLimitStartTime: ").append(mUsageLimitStartTimeInMillis != Long.MIN_VALUE

                ? new Date(mUsageLimitStartTimeInMillis) : "Not specified").append("\n");

                ? new Date(mUsageLimitStartTimeInMillis) : "Not specified").append("\n");

        builder.append("UsageTimePeriod: ").append(mUsageLimitUsageTimePeriodInMinutes)

        builder.append("UsageTimePeriod: ").append(mUsageLimitUsageTimePeriodInMinutes)