diff options
author | Sarah Chin <sarahchin@google.com> | 2023-02-28 23:30:17 -0800 |
---|---|---|
committer | Sarah Chin <sarahchin@google.com> | 2023-03-01 23:58:19 -0800 |
commit | 71eb4b5242957e89bb6f53f268c2d30fd83b575d (patch) | |
tree | d53c9c8b58b0e475e5774751728d52fa88f8259b | |
parent | b5a2f3818884aa80015671cc4a7abd70cf960632 (diff) | |
download | service_entitlement-71eb4b5242957e89bb6f53f268c2d30fd83b575d.tar.gz |
Update premium network entitlement API per specs
Rename network_identifier to boostType
Use APP ID 2010 instead of 2012
Test: build
Bug: 264711636
Change-Id: Idbc9e78550d72747fdedf1c9b440ca6affa9608e
3 files changed, 10 insertions, 11 deletions
diff --git a/java/com/android/libraries/entitlement/ServiceEntitlement.java b/java/com/android/libraries/entitlement/ServiceEntitlement.java index e050cd3..c0d6d55 100644 --- a/java/com/android/libraries/entitlement/ServiceEntitlement.java +++ b/java/com/android/libraries/entitlement/ServiceEntitlement.java @@ -53,9 +53,9 @@ public class ServiceEntitlement { */ public static final String APP_ODSA_PRIMARY = "ap2009"; /** - * App ID for premium network slice entitlement + * App ID for data plan information entitlement. */ - public static final String APP_PREMIUM_NETWORK_SLICE = "ap2012"; + public static final String APP_DATA_PLAN_BOOST = "ap2010"; private final CarrierConfig carrierConfig; private final EapAkaApi eapAkaApi; diff --git a/java/com/android/libraries/entitlement/ServiceEntitlementRequest.java b/java/com/android/libraries/entitlement/ServiceEntitlementRequest.java index 59e70ef..e0ecbf7 100644 --- a/java/com/android/libraries/entitlement/ServiceEntitlementRequest.java +++ b/java/com/android/libraries/entitlement/ServiceEntitlementRequest.java @@ -123,10 +123,9 @@ public abstract class ServiceEntitlementRequest { public abstract String acceptContentType(); /** - * Returns the network identifier for premium network. Used for premium network slice - * entitlement. + * Returns the boost type for premium network. Used for premium network slice entitlement. */ - public abstract String networkIdentifier(); + public abstract String boostType(); /** * Returns a new {@link Builder} object. @@ -146,7 +145,7 @@ public abstract class ServiceEntitlementRequest { .setNotificationToken("") .setNotificationAction(NOTICATION_ACTION_ENABLE_FCM) .setAcceptContentType(ACCEPT_CONTENT_TYPE_JSON_AND_XML) - .setNetworkIdentifier(""); + .setBoostType(""); } /** @@ -264,12 +263,12 @@ public abstract class ServiceEntitlementRequest { public abstract Builder setAcceptContentType(String contentType); /** - * Sets the network identifier for premium network. Used by HTTP parameter - * "network_identifier" in case of premium network slice entitlement. + * Sets the boost type for premium network. Used by HTTP parameter + * "boost_type" in case of premium network slice entitlement. * * <p>Optional. */ - public abstract Builder setNetworkIdentifier(String value); + public abstract Builder setBoostType(String value); public abstract ServiceEntitlementRequest build(); } diff --git a/java/com/android/libraries/entitlement/eapaka/EapAkaApi.java b/java/com/android/libraries/entitlement/eapaka/EapAkaApi.java index dc3c518..be41ca7 100644 --- a/java/com/android/libraries/entitlement/eapaka/EapAkaApi.java +++ b/java/com/android/libraries/entitlement/eapaka/EapAkaApi.java @@ -91,7 +91,7 @@ public class EapAkaApi { private static final String OLD_TERMINAL_ID = "old_terminal_id"; private static final String OLD_TERMINAL_ICCID = "old_terminal_iccid"; - private static final String NETWORK_IDENTIFIER = "network_identifier"; + private static final String BOOST_TYPE = "boost_type"; // In case of EAP-AKA synchronization failure or another challenge, we try to authenticate for // at most three times. @@ -362,7 +362,7 @@ public class EapAkaApi { // Optional query parameters, append them if not empty appendOptionalQueryParameter(urlBuilder, APP_VERSION, request.appVersion()); appendOptionalQueryParameter(urlBuilder, APP_NAME, request.appName()); - appendOptionalQueryParameter(urlBuilder, NETWORK_IDENTIFIER, request.networkIdentifier()); + appendOptionalQueryParameter(urlBuilder, BOOST_TYPE, request.boostType()); for (String appId : appIds) { urlBuilder.appendQueryParameter(APP, appId); |