Merge "Skip checking satellite support for registerForSatelliteProvisionStateChanged" into main
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
index d4cabc5..a23e505 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
@@ -2754,11 +2754,6 @@
*/
@SatelliteManager.SatelliteResult public int registerForSatelliteProvisionStateChanged(
@NonNull ISatelliteProvisionStateCallback callback) {
- int error = evaluateOemSatelliteRequestAllowed(false);
- if (error != SATELLITE_RESULT_SUCCESS) {
- return error;
- }
-
mSatelliteProvisionStateChangedListeners.put(callback.asBinder(), callback);
boolean isProvisioned = Boolean.TRUE.equals(isDeviceProvisioned());
@@ -4451,6 +4446,7 @@
}
registerForSatelliteSupportedStateChanged();
selectBindingSatelliteSubscription(false);
+ notifySatelliteSupportedStateChanged(supported);
}
private void updateSatelliteEnabledState(boolean enabled, String caller) {
@@ -4778,7 +4774,9 @@
}
mIsSatelliteSupported = supported;
}
+ }
+ private void notifySatelliteSupportedStateChanged(boolean supported) {
List<ISatelliteSupportedStateCallback> deadCallersList = new ArrayList<>();
mSatelliteSupportedStateChangedListeners.values().forEach(listener -> {
try {
diff --git a/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java
index 097e295..876410c 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java
@@ -1723,12 +1723,7 @@
}
};
int errorCode = mSatelliteControllerUT.registerForSatelliteProvisionStateChanged(callback);
- assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, errorCode);
-
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
- verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
- errorCode = mSatelliteControllerUT.registerForSatelliteProvisionStateChanged(callback);
- assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, errorCode);
+ assertEquals(SATELLITE_RESULT_SUCCESS, errorCode);
resetSatelliteControllerUT();
setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
@@ -1760,6 +1755,7 @@
semaphore, 1, "testRegisterForSatelliteProvisionStateChanged"));
mSatelliteControllerUT.unregisterForSatelliteProvisionStateChanged(callback);
+ semaphore.drainPermits();
cancelRemote = mSatelliteControllerUT.provisionSatelliteService(
TEST_SATELLITE_TOKEN,
testProvisionData, mIIntegerConsumer);