2 files changed, 9 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
index 55db6d21b5..2f285757a5 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
@@ -2872,6 +2872,7 @@ public class SatelliteController extends Handler {
      * @return true if satellite is provisioned on the given subscription else return false.
      */
     @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+    @Nullable
     protected Boolean isSatelliteViaOemProvisioned() {
         synchronized (mSatelliteViaOemProvisionLock) {
             if (mOverriddenIsSatelliteViaOemProvisioned != null) {
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
index 149b0543a5..c491476534 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
@@ -309,8 +309,14 @@ public class SatelliteSOSMessageRecommender extends Handler {
         }
     }
 
-    private boolean isSatelliteViaOemAvailable() {
-        return mSatelliteController.isSatelliteViaOemProvisioned();
+    /**
+     * Check if satellite is available via OEM
+     * @return {@code true} if satellite is provisioned via OEM else return {@code false}
+     */
+    @VisibleForTesting
+    public boolean isSatelliteViaOemAvailable() {
+        Boolean satelliteProvisioned = mSatelliteController.isSatelliteViaOemProvisioned();
+        return satelliteProvisioned != null ? satelliteProvisioned : false;
     }
 
     private boolean isSatelliteViaCarrierAvailable() {