changed the name to onSatelliteEntitlementStatus.
Bug: 319819582
Test: atest TeleServiceTests
Change-Id: Iba0bb3a5c593b4115457b2b19ea231b27f93cea5
diff --git a/src/com/android/phone/satellite/entitlement/SatelliteEntitlementController.java b/src/com/android/phone/satellite/entitlement/SatelliteEntitlementController.java
index 8227c84..94362a0 100644
--- a/src/com/android/phone/satellite/entitlement/SatelliteEntitlementController.java
+++ b/src/com/android/phone/satellite/entitlement/SatelliteEntitlementController.java
@@ -528,7 +528,7 @@
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
public void updateSatelliteEntitlementStatus(int subId, boolean enabled,
List<String> plmnAllowedList) {
- SatelliteController.getInstance().updateSatelliteEntitlementStatus(subId, enabled,
+ SatelliteController.getInstance().onSatelliteEntitlementStatusUpdated(subId, enabled,
plmnAllowedList, null);
}
diff --git a/tests/src/com/android/phone/satellite/entitlement/SatelliteEntitlementControllerTest.java b/tests/src/com/android/phone/satellite/entitlement/SatelliteEntitlementControllerTest.java
index e208e6c..18a0284 100644
--- a/tests/src/com/android/phone/satellite/entitlement/SatelliteEntitlementControllerTest.java
+++ b/tests/src/com/android/phone/satellite/entitlement/SatelliteEntitlementControllerTest.java
@@ -165,7 +165,7 @@
mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
- verify(mSatelliteController, never()).updateSatelliteEntitlementStatus(anyInt(),
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
anyBoolean(), anyList(), any());
mCarrierConfigBundle.putBoolean(
@@ -176,7 +176,7 @@
mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
- verify(mSatelliteController, never()).updateSatelliteEntitlementStatus(anyInt(),
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
anyBoolean(), anyList(), any());
replaceInstance(SatelliteEntitlementController.class, "mExponentialBackoffPerSub",
@@ -187,7 +187,7 @@
mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
- verify(mSatelliteController, never()).updateSatelliteEntitlementStatus(anyInt(),
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
anyBoolean(), anyList(), any());
setInternetConnected(true);
@@ -196,7 +196,7 @@
mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
- verify(mSatelliteController, never()).updateSatelliteEntitlementStatus(anyInt(),
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
anyBoolean(), anyList(), any());
// Verify start the query when isQueryAvailable return true
@@ -207,7 +207,7 @@
mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
- verify(mSatelliteController).updateSatelliteEntitlementStatus(anyInt(),
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(anyInt(),
anyBoolean(), anyList(), any());
}
@@ -220,7 +220,7 @@
verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
// Verify don't call the updateSatelliteEntitlementStatus.
- verify(mSatelliteController, never()).updateSatelliteEntitlementStatus(anyInt(),
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
anyBoolean(), anyList(), any());
// Verify call the checkSatelliteEntitlementStatus with invalid response.
@@ -235,7 +235,7 @@
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
// Verify call the updateSatelliteEntitlementStatus with satellite service is disabled
// and empty PLMNAllowed
- verify(mSatelliteController).updateSatelliteEntitlementStatus(eq(SUB_ID),
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID),
eq(false), eq(new ArrayList<>()), any());
// Verify call the checkSatelliteEntitlementStatus with the subscribed result.
@@ -249,7 +249,7 @@
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
// Verify call the updateSatelliteEntitlementStatus with satellite service is enable and
// availablePLMNAllowedList
- verify(mSatelliteController).updateSatelliteEntitlementStatus(eq(SUB_ID), eq(true),
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
eq(PLMN_ALLOWED_LIST), any());
// Change subId and verify call the updateSatelliteEntitlementStatus with satellite
@@ -260,7 +260,7 @@
mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
- verify(mSatelliteController).updateSatelliteEntitlementStatus(eq(SUB_ID_2), eq(true),
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID_2), eq(true),
eq(PLMN_ALLOWED_LIST), any());
}
@@ -284,7 +284,7 @@
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
// Verify call the updateSatelliteEntitlementStatus with satellite service is available.
- verify(mSatelliteController).updateSatelliteEntitlementStatus(eq(SUB_ID), eq(true),
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
eq(PLMN_ALLOWED_LIST), any());
}
@@ -299,7 +299,7 @@
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
// Verify call the updateSatelliteEntitlementStatus with satellite service is available.
- verify(mSatelliteController).updateSatelliteEntitlementStatus(eq(SUB_ID), eq(true),
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
eq(PLMN_ALLOWED_LIST), any());
}