Merge "Remove unused instance" into sc-dev am: 08fd8173b5 am: 32f90dfec1

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

Change-Id: I81a24c534a4bd29627c528a396b28cca87d623a3

2 files changed, 2 insertions, 9 deletions

diff --git a/java/com/android/libraries/entitlement/ServiceEntitlement.java b/java/com/android/libraries/entitlement/ServiceEntitlement.java
index efb0734..d723e4c 100644
--- a/java/com/android/libraries/entitlement/ServiceEntitlement.java
+++ b/java/com/android/libraries/entitlement/ServiceEntitlement.java
@@ -51,7 +51,6 @@ public class ServiceEntitlement {
      */
     public static final String APP_ODSA_PRIMARY = "ap2009";
 
-    private final Context context;
     private final CarrierConfig carrierConfig;
     private final EapAkaApi eapAkaApi;
 
@@ -68,14 +67,12 @@ public class ServiceEntitlement {
      *                          for how to get the subscroption ID.
      */
     public ServiceEntitlement(Context context, CarrierConfig carrierConfig, int simSubscriptionId) {
-        this.context = context;
         this.carrierConfig = carrierConfig;
         this.eapAkaApi = new EapAkaApi(context, simSubscriptionId);
     }
 
     @VisibleForTesting
-    ServiceEntitlement(Context context, CarrierConfig carrierConfig, EapAkaApi eapAkaApi) {
-        this.context = context;
+    ServiceEntitlement(CarrierConfig carrierConfig, EapAkaApi eapAkaApi) {
         this.carrierConfig = carrierConfig;
         this.eapAkaApi = eapAkaApi;
     }
diff --git a/tests/src/com/android/libraries/entitlement/ServiceEntitlementTest.java b/tests/src/com/android/libraries/entitlement/ServiceEntitlementTest.java
index c9f9b06..e54d87f 100644
--- a/tests/src/com/android/libraries/entitlement/ServiceEntitlementTest.java
+++ b/tests/src/com/android/libraries/entitlement/ServiceEntitlementTest.java
@@ -20,8 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.when;
 
-import android.content.Context;
-
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.libraries.entitlement.eapaka.EapAkaApi;
@@ -45,8 +43,6 @@ public class ServiceEntitlementTest {
     @Rule
     public final MockitoRule rule = MockitoJUnit.rule();
     @Mock
-    Context mMockContext;
-    @Mock
     EapAkaApi mMockEapAkaApi;
 
     private ServiceEntitlement mServiceEntitlement;
@@ -55,7 +51,7 @@ public class ServiceEntitlementTest {
     @Before
     public void setUp() {
         mCarrierConfig = CarrierConfig.builder().setServerUrl(TEST_URL).build();
-        mServiceEntitlement = new ServiceEntitlement(mMockContext, mCarrierConfig, mMockEapAkaApi);
+        mServiceEntitlement = new ServiceEntitlement(mCarrierConfig, mMockEapAkaApi);
     }
 
     @Test