Merge changes from topic "bypass" am: cbcefac55f am: 58e145e51a am: 5774d577af am: 912315b57b

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2240185

Change-Id: Ica28a7e0ead5d3bed13d62eef118671adb11cef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 31 insertions, 2 deletions

diff --git a/java/com/android/libraries/entitlement/ServiceEntitlement.java b/java/com/android/libraries/entitlement/ServiceEntitlement.java
index 73a9c47..e050cd3 100644
--- a/java/com/android/libraries/entitlement/ServiceEntitlement.java
+++ b/java/com/android/libraries/entitlement/ServiceEntitlement.java
@@ -73,8 +73,37 @@ public class ServiceEntitlement {
      *                          for how to get the subscroption ID.
      */
     public ServiceEntitlement(Context context, CarrierConfig carrierConfig, int simSubscriptionId) {
-        this.carrierConfig = carrierConfig;
-        this.eapAkaApi = new EapAkaApi(context, simSubscriptionId, false, "");
+        this(
+                context,
+                carrierConfig,
+                simSubscriptionId,
+                /* saveHttpHistory= */ false,
+                /* bypassEapAkaResponse= */ "");
+    }
+
+    /**
+     * Creates an instance for service entitlement configuration query and operation for the
+     * carrier.
+     *
+     * @param context context of application
+     * @param carrierConfig carrier specific configs used in the queries and operations.
+     * @param simSubscriptionId the subscroption ID of the carrier's SIM on device. This indicates
+     *     which SIM to retrieve IMEI/IMSI from and perform EAP-AKA authentication with. See {@link
+     *     android.telephony.SubscriptionManager} for how to get the subscroption ID.
+     * @param saveHttpHistory set to {@code true} to save the history of request and response which
+     *     can later be retrieved by {@code getHistory()}. Intended for debugging.
+     */
+    public ServiceEntitlement(
+            Context context,
+            CarrierConfig carrierConfig,
+            int simSubscriptionId,
+            boolean saveHttpHistory) {
+        this(
+                context,
+                carrierConfig,
+                simSubscriptionId,
+                saveHttpHistory,
+                /* bypassEapAkaResponse= */ "");
     }
 
     /**