commit 4f9c89e215c60f6cfba4a1ae29a9778aa6f9823a
author Thomas Nguyen <tnd@google.com> Mon Dec 18 10:51:57 2023 -0800
committer Thomas Nguyen <tnd@google.com> Mon Jan 08 14:10:55 2024 -0800
tree d19f69979bf35899cd4c5c5a21c569654899dc9d
parent 1a5bf99b9e700f7cedf3661443effa46a3b7cc64

Add logic to SatelliteAccessController class

Bug: 313773568
Test: atest SatelliteAccessControllerTest
atest SatelliteManagerTestOnMockService

Change-Id: I5eb3651baed905187cb27040a2135199e9f5c24d

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 2f372ce..76cf979 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -994,6 +994,11 @@
         }
 
         ServiceState serviceState = phone.getServiceState();
+        if (serviceState == null) {
+            Log.e(LOG_TAG, "updateDataRoamingStatus: serviceState is null");
+            return;
+        }
+
         String roamingNumeric = serviceState.getOperatorNumeric();
         String roamingNumericReason = "RoamingNumeric=" + roamingNumeric;
         String callingReason = "CallingReason=" + reason;