aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyosun Kim <hyosunkim@google.com>2024-01-17 07:12:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-01-17 07:12:03 +0000
commit22996669e08e1e3b71087392c51dfeb20010a303 (patch)
tree758a6837e47f00dabbcdf29bf866109a223f60fd
parente639ce3d5df444bbf3023f3dd4d1965ab7ffc299 (diff)
parent75bd4bfbd47932cc8074bef62051f4f586b40ddf (diff)
downloadservice_entitlement-22996669e08e1e3b71087392c51dfeb20010a303.tar.gz
To check the eligibility of satellite service, add satellite app Id. am: 75bd4bfbd4
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2909503 Change-Id: I9c9f7a56db9aaf7db2aee73d3e6918789b3b9da2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--java/com/android/libraries/entitlement/ServiceEntitlement.java5
-rw-r--r--java/com/android/libraries/entitlement/utils/Ts43Constants.java7
2 files changed, 11 insertions, 1 deletions
diff --git a/java/com/android/libraries/entitlement/ServiceEntitlement.java b/java/com/android/libraries/entitlement/ServiceEntitlement.java
index 0ced9e0..af30de6 100644
--- a/java/com/android/libraries/entitlement/ServiceEntitlement.java
+++ b/java/com/android/libraries/entitlement/ServiceEntitlement.java
@@ -83,6 +83,11 @@ public class ServiceEntitlement {
public static final String APP_PHONE_NUMBER_INFORMATION =
Ts43Constants.APP_PHONE_NUMBER_INFORMATION;
+ /**
+ * App ID for satellite entitlement.
+ */
+ public static final String APP_SATELLITE_ENTITLEMENT = Ts43Constants.APP_SATELLITE_ENTITLEMENT;
+
private final CarrierConfig carrierConfig;
private final EapAkaApi eapAkaApi;
private ServiceEntitlementRequest mOidcRequest;
diff --git a/java/com/android/libraries/entitlement/utils/Ts43Constants.java b/java/com/android/libraries/entitlement/utils/Ts43Constants.java
index 6eab0dc..89fcb01 100644
--- a/java/com/android/libraries/entitlement/utils/Ts43Constants.java
+++ b/java/com/android/libraries/entitlement/utils/Ts43Constants.java
@@ -58,6 +58,9 @@ public final class Ts43Constants {
/** App ID for phone number information. */
public static final String APP_PHONE_NUMBER_INFORMATION = "ap2014";
+ /** App ID for satellite entitlement. */
+ public static final String APP_SATELLITE_ENTITLEMENT = "ap2015";
+
@Retention(RetentionPolicy.SOURCE)
@StringDef({
APP_UNKNOWN,
@@ -70,7 +73,8 @@ public final class Ts43Constants {
APP_ODSA_SERVER_INITIATED_REQUESTS,
APP_DIRECT_CARRIER_BILLING,
APP_PRIVATE_USER_IDENTITY,
- APP_PHONE_NUMBER_INFORMATION
+ APP_PHONE_NUMBER_INFORMATION,
+ APP_SATELLITE_ENTITLEMENT
})
public @interface AppId {
}
@@ -93,6 +97,7 @@ public final class Ts43Constants {
case APP_DIRECT_CARRIER_BILLING:
case APP_PRIVATE_USER_IDENTITY:
case APP_PHONE_NUMBER_INFORMATION:
+ case APP_SATELLITE_ENTITLEMENT:
return true;
default: // fall through
}