commit 7ec59796c0983edc4e026eb2c1a7cbf68358aaa5
author Sarah Chin <sarahchin@google.com> Mon Oct 31 11:47:39 2022 -0700
committer Sarah Chin <sarahchin@google.com> Mon Oct 31 11:47:42 2022 -0700
tree 45d65d29b1bbcfd702944c5da2d5f8e48a93568c
parent 5ddc2cac7285b3da28df7654c7590805f21166c0

Fix crash in telephony tests

This doesn't fix the root cause but will fix the NPE allowing us to see
logs showing the actual issue.

Test: atest FrameworksTelephonyTests
Bug: 256244889
Change-Id: I2e83c7fbd3b75ffeffc97d70da174c492924433f

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index abbd816..6a7737a 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -935,7 +935,11 @@
      * @return whether we have transitioned to dataRoaming
      */
     private boolean dataIsNowRoaming(int subId) {
-        return getPhone(subId).getServiceState().getDataRoaming();
+        if (getPhone(subId).getServiceState() == null) {
+            return false;
+        } else {
+            return getPhone(subId).getServiceState().getDataRoaming();
+        }
     }
 
     private void updateLimitedSimFunctionForDualSim() {