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

Merge "Rename PasspointConfiguration#getSubscriptionExpirationTimeInMillis"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-17 16:23:47 +00:00
committed by Android (Google) Code Review
parent 2481844969 1caf57d5ca
commit 309dca6ae2
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -31730,7 +31730,7 @@ package android.net.wifi.hotspot2 {
method public int describeContents();
method public android.net.wifi.hotspot2.pps.Credential getCredential();
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 public boolean isOsuProvisioned();
method public void setCredential(android.net.wifi.hotspot2.pps.Credential);

2
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -359,7 +359,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
mPasspointUniqueId = config.getUniqueId();
mFqdn = config.getHomeSp().getFqdn();
mProviderFriendlyName = config.getHomeSp().getFriendlyName();
mSubscriptionExpirationTimeInMillis = config.getSubscriptionExpirationTimeInMillis();
mSubscriptionExpirationTimeInMillis = config.getSubscriptionExpirationTimeMillis();
if (config.isOsuProvisioned()) {
mPasspointConfigurationVersion = PasspointConfigurationVersion.OSU_PROVISIONED;
} else {

1
wifi/Android.bp
View File

@@ -86,6 +86,7 @@ java_library {
// TODO(b/146757305): should be unnecessary once
// sdk_version="module_lib_current"
"android_system_stubs_current",
"framework_mediaprovider_annotation", // for android.annotation.CurrentTimeMillisLong
],
srcs: [
":framework-wifi-updatable-sources",

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

@@ -19,6 +19,7 @@ package android.net.wifi.hotspot2;
import static android.net.wifi.WifiConfiguration.METERED_OVERRIDE_NONE;
import static android.net.wifi.WifiConfiguration.MeteredOverride;
import android.annotation.CurrentTimeMillisLong;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
@@ -247,12 +248,12 @@ public final class PasspointConfiguration implements Parcelable {
*
* Use Long.MIN_VALUE to indicate unset value.
*/
private long mSubscriptionExpirationTimeInMillis = Long.MIN_VALUE;
private long mSubscriptionExpirationTimeMillis = Long.MIN_VALUE;
/**
* @hide
*/
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
@@ -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
*/
public long getSubscriptionExpirationTimeInMillis() {
return mSubscriptionExpirationTimeInMillis;
@CurrentTimeMillisLong
public long getSubscriptionExpirationTimeMillis() {
return mSubscriptionExpirationTimeMillis;
}
/**
@@ -561,7 +563,7 @@ public final class PasspointConfiguration implements Parcelable {
mUpdateIdentifier = source.mUpdateIdentifier;
mCredentialPriority = source.mCredentialPriority;
mSubscriptionCreationTimeInMillis = source.mSubscriptionCreationTimeInMillis;
mSubscriptionExpirationTimeInMillis = source.mSubscriptionExpirationTimeInMillis;
mSubscriptionExpirationTimeMillis = source.mSubscriptionExpirationTimeMillis;
mSubscriptionType = source.mSubscriptionType;
mUsageLimitDataLimit = source.mUsageLimitDataLimit;
mUsageLimitStartTimeInMillis = source.mUsageLimitStartTimeInMillis;
@@ -590,7 +592,7 @@ public final class PasspointConfiguration implements Parcelable {
dest.writeInt(mUpdateIdentifier);
dest.writeInt(mCredentialPriority);
dest.writeLong(mSubscriptionCreationTimeInMillis);
dest.writeLong(mSubscriptionExpirationTimeInMillis);
dest.writeLong(mSubscriptionExpirationTimeMillis);
dest.writeString(mSubscriptionType);
dest.writeLong(mUsageLimitUsageTimePeriodInMinutes);
dest.writeLong(mUsageLimitStartTimeInMillis);
@@ -628,7 +630,7 @@ public final class PasspointConfiguration implements Parcelable {
&& mUpdateIdentifier == that.mUpdateIdentifier
&& mCredentialPriority == that.mCredentialPriority
&& mSubscriptionCreationTimeInMillis == that.mSubscriptionCreationTimeInMillis
&& mSubscriptionExpirationTimeInMillis == that.mSubscriptionExpirationTimeInMillis
&& mSubscriptionExpirationTimeMillis == that.mSubscriptionExpirationTimeMillis
&& TextUtils.equals(mSubscriptionType, that.mSubscriptionType)
&& mUsageLimitUsageTimePeriodInMinutes == that.mUsageLimitUsageTimePeriodInMinutes
&& mUsageLimitStartTimeInMillis == that.mUsageLimitStartTimeInMillis
@@ -646,7 +648,7 @@ public final class PasspointConfiguration implements Parcelable {
public int hashCode() {
return Objects.hash(mHomeSp, mCredential, mPolicy, mSubscriptionUpdate, mTrustRootCertList,
mUpdateIdentifier, mCredentialPriority, mSubscriptionCreationTimeInMillis,
mSubscriptionExpirationTimeInMillis, mUsageLimitUsageTimePeriodInMinutes,
mSubscriptionExpirationTimeMillis, mUsageLimitUsageTimePeriodInMinutes,
mUsageLimitStartTimeInMillis, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes,
mServiceFriendlyNames, mCarrierId, mIsAutojoinEnabled, mIsMacRandomizationEnabled,
mMeteredOverride);
@@ -661,8 +663,8 @@ public final class PasspointConfiguration implements Parcelable {
mSubscriptionCreationTimeInMillis != Long.MIN_VALUE
? new Date(mSubscriptionCreationTimeInMillis) : "Not specified").append("\n");
builder.append("SubscriptionExpirationTime: ").append(
mSubscriptionExpirationTimeInMillis != Long.MIN_VALUE
? new Date(mSubscriptionExpirationTimeInMillis) : "Not specified").append("\n");
mSubscriptionExpirationTimeMillis != Long.MIN_VALUE
? new Date(mSubscriptionExpirationTimeMillis) : "Not specified").append("\n");
builder.append("UsageLimitStartTime: ").append(mUsageLimitStartTimeInMillis != Long.MIN_VALUE
? new Date(mUsageLimitStartTimeInMillis) : "Not specified").append("\n");
builder.append("UsageTimePeriod: ").append(mUsageLimitUsageTimePeriodInMinutes)