commit 7b5ace01c87f33464519e3ef91c8625803aed4f3
author Aishwarya Mallampati <amallampati@google.com> Sat Jan 04 01:39:30 2025 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 07 17:29:05 2025 -0800
tree 93b4b16925bfdec4e0235d570fad197277c7c1a6
parent 51ef54a2b5f742986b840b443cbc76c1c702158c

Add null check for subInfo

Bug: 387389548
Test: manual
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4f6188d25779f90a50d2858d1760f976cd9ecff2)
Merged-In: I8eb3b6c2d810dd667331e212da6f6a39b63d0a6d
Change-Id: I8eb3b6c2d810dd667331e212da6f6a39b63d0a6d

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
index a0a050c..fc8d607 100644
--- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
+++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
@@ -4721,6 +4721,9 @@
     public boolean isSatelliteProvisionedForNonIpDatagram(int subId) {
         SubscriptionInfoInternal subInfo = mSubscriptionDatabaseManager.getSubscriptionInfoInternal(
                 subId);
+        if (subInfo == null) {
+            return false;
+        }
 
         return subInfo.getIsSatelliteProvisionedForNonIpDatagram() == 1;
     }