diff options
| author | Hyosun Kim <hyosunkim@google.com> | 2023-12-15 16:48:46 +0000 |
|---|---|---|
| committer | Hyosun Kim <hyosunkim@google.com> | 2024-01-16 07:33:22 +0000 |
| commit | 75bd4bfbd47932cc8074bef62051f4f586b40ddf (patch) | |
| tree | 758a6837e47f00dabbcdf29bf866109a223f60fd | |
| parent | e639ce3d5df444bbf3023f3dd4d1965ab7ffc299 (diff) | |
| download | service_entitlement-75bd4bfbd47932cc8074bef62051f4f586b40ddf.tar.gz | |
To check the eligibility of satellite service, add satellite app Id.
1. add a satellite app id
Bug: 306670992
Test: atest SatelliteControllerTest
Test: atest TeleServiceTests
Test : Manually test with mock entitlement server for satellite (ag/25356673).
1. Check if a query is triggered when data is connected or CarrierConfigChanged is received.
2. Check if the first query's response with a satellite service enabled triggers internally satellite enabled.
3. Check if a query is not made before the refresh time.
4. Check if the next query's response with a satellite service disabled triggers internally satellite disabled.
Change-Id: I5ac6555e943ed9603aad0690d60ed75a851242da
Merged-In: I5ac6555e943ed9603aad0690d60ed75a851242da
| -rw-r--r-- | java/com/android/libraries/entitlement/ServiceEntitlement.java | 5 | ||||
| -rw-r--r-- | java/com/android/libraries/entitlement/utils/Ts43Constants.java | 7 |
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 } |