From 8f4f48b96b690aa099f85aad7a361cf39e431f42 Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Mon, 1 May 2017 09:33:46 -0700 Subject: hotspot2: update method name for timestamp related APIs Bug: 37514629 Test: build Change-Id: Ib8ade875bd51df6b8fd0f1acb6b730cc545aa084 --- .../server/wifi/hotspot2/PasspointXmlUtils.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointXmlUtils.java b/service/java/com/android/server/wifi/hotspot2/PasspointXmlUtils.java index 270c644c6..de2b9c059 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointXmlUtils.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointXmlUtils.java @@ -124,14 +124,14 @@ public class PasspointXmlUtils { XmlUtil.writeNextValue(out, XML_TAG_CREDENTIAL_PRIORITY, config.getCredentialPriority()); XmlUtil.writeNextValue(out, XML_TAG_TRUST_ROOT_CERT_LIST, config.getTrustRootCertList()); XmlUtil.writeNextValue(out, XML_TAG_SUBSCRIPTION_CREATION_TIME, - config.getSubscriptionCreationTimeInMs()); + config.getSubscriptionCreationTimeInMillis()); XmlUtil.writeNextValue(out, XML_TAG_SUBSCRIPTION_EXPIRATION_TIME, - config.getSubscriptionExpirationTimeInMs()); + config.getSubscriptionExpirationTimeInMillis()); XmlUtil.writeNextValue(out, XML_TAG_SUBSCRIPTION_TYPE, config.getSubscriptionType()); XmlUtil.writeNextValue(out, XML_TAG_USAGE_LIMIT_TIME_PERIOD, config.getUsageLimitUsageTimePeriodInMinutes()); XmlUtil.writeNextValue(out, XML_TAG_USAGE_LIMIT_START_TIME, - config.getUsageLimitStartTimeInMs()); + config.getUsageLimitStartTimeInMillis()); XmlUtil.writeNextValue(out, XML_TAG_USAGE_LIMIT_DATA_LIMIT, config.getUsageLimitDataLimit()); XmlUtil.writeNextValue(out, XML_TAG_USAGE_LIMIT_TIME_LIMIT, @@ -171,10 +171,10 @@ public class PasspointXmlUtils { config.setTrustRootCertList((Map) value); break; case XML_TAG_SUBSCRIPTION_CREATION_TIME: - config.setSubscriptionCreationTimeInMs((long) value); + config.setSubscriptionCreationTimeInMillis((long) value); break; case XML_TAG_SUBSCRIPTION_EXPIRATION_TIME: - config.setSubscriptionExpirationTimeInMs((long) value); + config.setSubscriptionExpirationTimeInMillis((long) value); break; case XML_TAG_SUBSCRIPTION_TYPE: config.setSubscriptionType((String) value); @@ -183,7 +183,7 @@ public class PasspointXmlUtils { config.setUsageLimitUsageTimePeriodInMinutes((long) value); break; case XML_TAG_USAGE_LIMIT_START_TIME: - config.setUsageLimitStartTimeInMs((long) value); + config.setUsageLimitStartTimeInMillis((long) value); break; case XML_TAG_USAGE_LIMIT_DATA_LIMIT: config.setUsageLimitDataLimit((long) value); @@ -260,8 +260,9 @@ public class PasspointXmlUtils { return; } XmlUtil.writeNextSectionStart(out, XML_TAG_SECTION_HEADER_CREDENTIAL); - XmlUtil.writeNextValue(out, XML_TAG_CREATION_TIME, credential.getCreationTimeInMs()); - XmlUtil.writeNextValue(out, XML_TAG_EXPIRATION_TIME, credential.getExpirationTimeInMs()); + XmlUtil.writeNextValue(out, XML_TAG_CREATION_TIME, credential.getCreationTimeInMillis()); + XmlUtil.writeNextValue(out, XML_TAG_EXPIRATION_TIME, + credential.getExpirationTimeInMillis()); XmlUtil.writeNextValue(out, XML_TAG_REALM, credential.getRealm()); XmlUtil.writeNextValue(out, XML_TAG_CHECK_AAA_SERVER_CERT_STATUS, credential.getCheckAaaServerCertStatus()); @@ -519,10 +520,10 @@ public class PasspointXmlUtils { Object value = XmlUtil.readCurrentValue(in, name); switch (name[0]) { case XML_TAG_CREATION_TIME: - credential.setCreationTimeInMs((long) value); + credential.setCreationTimeInMillis((long) value); break; case XML_TAG_EXPIRATION_TIME: - credential.setExpirationTimeInMs((long) value); + credential.setExpirationTimeInMillis((long) value); break; case XML_TAG_REALM: credential.setRealm((String) value); -- cgit v1.2.3