Snap for 11400057 from 1b4bffff8f6786f3589dcb6dd6ad9e9ee6844f6f to simpleperf-releasesimpleperf-release

Change-Id: Iac6e090da74b418b9e30001a34536950bb4bb35c

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..ea7bca7 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 = "ap2016";
+
     @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
         }