diff options
author | Aishwarya Mallampati <amallampati@google.com> | 2024-02-28 17:38:43 +0000 |
---|---|---|
committer | Aishwarya Mallampati <amallampati@google.com> | 2024-02-28 18:19:02 +0000 |
commit | 59a697cf696c224fcfce0f5046b39cb3fc760876 (patch) | |
tree | 88a7c873af0d0c55c5a4836f9b0e46680dce510e /src | |
parent | cef2c097f25e2226fca84bc8a97991f6dd6f0091 (diff) | |
download | telephony-59a697cf696c224fcfce0f5046b39cb3fc760876.tar.gz |
Return false if isSatelliteViaOemProvisioned returns null
Bug: 327303111
Test: atest SatelliteSOSMessageRecommenderTest
Change-Id: Iaac4d43a44e76cb92056518e05a63b45f3cd17e6
Diffstat (limited to 'src')
-rw-r--r-- | src/java/com/android/internal/telephony/satellite/SatelliteController.java | 1 | ||||
-rw-r--r-- | src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java | 10 |
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() { |